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>

1 files changed, 0 insertions, 26 deletions

diff --git a/arch/s390/include/asm/cputime.h b/arch/s390/include/asm/cputime.h
index b91e960e4045..221b454c734a 100644
--- a/arch/s390/include/asm/cputime.h
+++ b/arch/s390/include/asm/cputime.h
@@ -22,15 +22,7 @@ typedef unsigned long long __nocast cputime64_t;
 
 static inline unsigned long __div(unsigned long long n, unsigned long base)
 {
-#ifndef CONFIG_64BIT
-        register_pair rp;
-
-        rp.pair = n >> 1;
-        asm ("dr %0,%1" : "+d" (rp) : "d" (base >> 1));
-        return rp.subreg.odd;
-#else /* CONFIG_64BIT */
         return n / base;
-#endif /* CONFIG_64BIT */
 }
 
 #define cputime_one_jiffy               jiffies_to_cputime(1)
@@ -101,17 +93,8 @@ static inline void cputime_to_timespec(const cputime_t cputime,
                                        struct timespec *value)
 {
         unsigned long long __cputime = (__force unsigned long long) cputime;
-#ifndef CONFIG_64BIT
-        register_pair rp;
-
-        rp.pair = __cputime >> 1;
-        asm ("dr %0,%1" : "+d" (rp) : "d" (CPUTIME_PER_SEC / 2));
-        value->tv_nsec = rp.subreg.even * NSEC_PER_USEC / CPUTIME_PER_USEC;
-        value->tv_sec = rp.subreg.odd;
-#else
         value->tv_nsec = (__cputime % CPUTIME_PER_SEC) * NSEC_PER_USEC / CPUTIME_PER_USEC;
         value->tv_sec = __cputime / CPUTIME_PER_SEC;
-#endif
 }
 
 /*
@@ -129,17 +112,8 @@ static inline void cputime_to_timeval(const cputime_t cputime,
                                       struct timeval *value)
 {
         unsigned long long __cputime = (__force unsigned long long) cputime;
-#ifndef CONFIG_64BIT
-        register_pair rp;
-
-        rp.pair = __cputime >> 1;
-        asm ("dr %0,%1" : "+d" (rp) : "d" (CPUTIME_PER_USEC / 2));
-        value->tv_usec = rp.subreg.even / CPUTIME_PER_USEC;
-        value->tv_sec = rp.subreg.odd;
-#else
         value->tv_usec = (__cputime % CPUTIME_PER_SEC) / CPUTIME_PER_USEC;
         value->tv_sec = __cputime / CPUTIME_PER_SEC;
-#endif
 }
 
 /*