diff options
| -rw-r--r-- | arch/Kconfig | 3 | ||||
| -rw-r--r-- | arch/s390/Kconfig | 1 | ||||
| -rw-r--r-- | arch/s390/oprofile/init.c | 6 |
3 files changed, 3 insertions, 7 deletions
diff --git a/arch/Kconfig b/arch/Kconfig index 43abf3c6da8e..f78c2be4242b 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -30,9 +30,6 @@ config OPROFILE_EVENT_MULTIPLEX config HAVE_OPROFILE bool -config HAVE_HWSAMPLER - bool - config KPROBES bool "Kprobes" depends on MODULES diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 0cf20adfbb45..ff19efdf6fef 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -115,7 +115,6 @@ config S390 select ARCH_INLINE_WRITE_UNLOCK_BH select ARCH_INLINE_WRITE_UNLOCK_IRQ select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE - select HAVE_HWSAMPLER config SCHED_OMIT_FRAME_POINTER def_bool y diff --git a/arch/s390/oprofile/init.c b/arch/s390/oprofile/init.c index 0e38a5b8793f..16c76def4a9d 100644 --- a/arch/s390/oprofile/init.c +++ b/arch/s390/oprofile/init.c @@ -133,7 +133,7 @@ static int oprofile_create_hwsampling_files(struct super_block *sb, return 0; } -int oprofile_hwsampler_init(struct oprofile_operations* ops) +static int oprofile_hwsampler_init(struct oprofile_operations *ops) { if (hwsampler_setup()) return -ENODEV; @@ -166,13 +166,13 @@ int oprofile_hwsampler_init(struct oprofile_operations* ops) return 0; } -void oprofile_hwsampler_exit(void) +static void oprofile_hwsampler_exit(void) { oprofile_timer_exit(); hwsampler_shutdown(); } -int __init oprofile_arch_init(struct oprofile_operations* ops) +int __init oprofile_arch_init(struct oprofile_operations *ops) { ops->backtrace = s390_backtrace; |