aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/oprofile/init.c
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2015-02-12 07:08:27 -0500
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2015-03-25 06:49:33 -0400
commit5a79859ae0f35d25c67a03e82bf0c80592f16a39 (patch)
tree37264d49f069812f19ced94e6ae171814fb7e498 /arch/s390/oprofile/init.c
parent1833c9f647e9bda1cd24653ff8f9c207b5f5b911 (diff)
s390: remove 31 bit support
Remove the 31 bit support in order to reduce maintenance cost and effectively remove dead code. Since a couple of years there is no distribution left that comes with a 31 bit kernel. The 31 bit kernel also has been broken since more than a year before anybody noticed. In addition I added a removal warning to the kernel shown at ipl for 5 minutes: a960062e5826 ("s390: add 31 bit warning message") which let everybody know about the plan to remove 31 bit code. We didn't get any response. Given that the last 31 bit only machine was introduced in 1999 let's remove the code. Anybody with 31 bit user space code can still use the compat mode. Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/oprofile/init.c')
-rw-r--r--arch/s390/oprofile/init.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/arch/s390/oprofile/init.c b/arch/s390/oprofile/init.c
index 9ffe645d5989..bc927a09a172 100644
--- a/arch/s390/oprofile/init.c
+++ b/arch/s390/oprofile/init.c
@@ -21,8 +21,6 @@
21 21
22extern void s390_backtrace(struct pt_regs * const regs, unsigned int depth); 22extern void s390_backtrace(struct pt_regs * const regs, unsigned int depth);
23 23
24#ifdef CONFIG_64BIT
25
26#include "hwsampler.h" 24#include "hwsampler.h"
27#include "op_counter.h" 25#include "op_counter.h"
28 26
@@ -495,14 +493,10 @@ static void oprofile_hwsampler_exit(void)
495 hwsampler_shutdown(); 493 hwsampler_shutdown();
496} 494}
497 495
498#endif /* CONFIG_64BIT */
499
500int __init oprofile_arch_init(struct oprofile_operations *ops) 496int __init oprofile_arch_init(struct oprofile_operations *ops)
501{ 497{
502 ops->backtrace = s390_backtrace; 498 ops->backtrace = s390_backtrace;
503 499
504#ifdef CONFIG_64BIT
505
506 /* 500 /*
507 * -ENODEV is not reported to the caller. The module itself 501 * -ENODEV is not reported to the caller. The module itself
508 * will use the timer mode sampling as fallback and this is 502 * will use the timer mode sampling as fallback and this is
@@ -511,14 +505,9 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
511 hwsampler_available = oprofile_hwsampler_init(ops) == 0; 505 hwsampler_available = oprofile_hwsampler_init(ops) == 0;
512 506
513 return 0; 507 return 0;
514#else
515 return -ENODEV;
516#endif
517} 508}
518 509
519void oprofile_arch_exit(void) 510void oprofile_arch_exit(void)
520{ 511{
521#ifdef CONFIG_64BIT
522 oprofile_hwsampler_exit(); 512 oprofile_hwsampler_exit();
523#endif
524} 513}