[PATCH] s390: oprofile Kconfig fixes

From: Arnd Bergmann <arnd@arndb.de>

Enable basic profiling code on s390 depending on CONFIG_PROFILING, not
CONFIG_OPROFILE.

CONFIG_PROFILING should enable the generic profiling code here, even if
CONFIG_OPROFILE is not set.  Note that the identical code on i386 is always
compiled in, regardless of CONFIG_PROFILING and CONFIG_OPROFILE.

arch/s390/kernel/time.c

@@ -179,7 +179,7 @@ __calculate_ticks(__u64 elapsed)
 #endif /* CONFIG_ARCH_S390X */
 
 
-#if defined(CONFIG_OPROFILE) || defined(CONFIG_OPROFILE_MODULE)
+#ifdef CONFIG_PROFILING
 extern char _stext, _etext;
 
 /*
@@ -223,7 +223,7 @@ static inline void s390_do_profile(struct pt_regs * regs)
 }
 #else
 #define s390_do_profile(regs)  do { ; } while(0)
-#endif /* CONFIG_OPROFILE */
+#endif /* CONFIG_PROFILING */
 
 
 /*

arch/s390/oprofile/Kconfig

@@ -5,8 +5,8 @@ menu "Profiling support"
 config PROFILING
 	bool "Profiling support (EXPERIMENTAL)"
 	help
-	  Say Y here to enable the extended profiling support mechanisms used
-	  by profilers such as OProfile.
+	  Say Y here to enable profiling support mechanisms used by
+	  profilers such as readprofile or OProfile.
 
 
 config OPROFILE