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, 14 deletions

diff --git a/arch/s390/mm/extmem.c b/arch/s390/mm/extmem.c
index 519bba716cc3..23c496957c22 100644
--- a/arch/s390/mm/extmem.c
+++ b/arch/s390/mm/extmem.c
@@ -51,7 +51,6 @@ struct qout64 {
         struct qrange range[6];
 };
 
-#ifdef CONFIG_64BIT
 struct qrange_old {
         unsigned int start; /* last byte type */
         unsigned int end;   /* last byte reserved */
@@ -65,7 +64,6 @@ struct qout64_old {
         int segrcnt;
         struct qrange_old range[6];
 };
-#endif
 
 struct qin64 {
         char qopcode;
@@ -103,7 +101,6 @@ static int scode_set;
 static int
 dcss_set_subcodes(void)
 {
-#ifdef CONFIG_64BIT
         char *name = kmalloc(8 * sizeof(char), GFP_KERNEL | GFP_DMA);
         unsigned long rx, ry;
         int rc;
@@ -135,7 +132,6 @@ dcss_set_subcodes(void)
                 segext_scode = DCSS_SEGEXTX;
                 return 0;
         }
-#endif
         /* Diag x'64' new subcodes are not supported, set to old subcodes */
         loadshr_scode = DCSS_LOADNOLY;
         loadnsr_scode = DCSS_LOADNSR;
@@ -208,7 +204,6 @@ dcss_diag(int *func, void *parameter,
         rx = (unsigned long) parameter;
         ry = (unsigned long) *func;
 
-#ifdef CONFIG_64BIT
         /* 64-bit Diag x'64' new subcode, keep in 64-bit addressing mode */
         if (*func > DCSS_SEGEXT)
                 asm volatile(
@@ -225,13 +220,6 @@ dcss_diag(int *func, void *parameter,
                         "       ipm     %2\n"
                         "       srl     %2,28\n"
                         : "+d" (rx), "+d" (ry), "=d" (rc) : : "cc");
-#else
-        asm volatile(
-                "       diag    %0,%1,0x64\n"
-                "       ipm     %2\n"
-                "       srl     %2,28\n"
-                : "+d" (rx), "+d" (ry), "=d" (rc) : : "cc");
-#endif
         *ret1 = rx;
         *ret2 = ry;
         return rc;
@@ -281,7 +269,6 @@ query_segment_type (struct dcss_segment *seg)
                 goto out_free;
         }
 
-#ifdef CONFIG_64BIT
         /* Only old format of output area of Diagnose x'64' is supported,
            copy data for the new format. */
         if (segext_scode == DCSS_SEGEXT) {
@@ -307,7 +294,6 @@ query_segment_type (struct dcss_segment *seg)
                 }
                 kfree(qout_old);
         }
-#endif
         if (qout->segcnt > 6) {
                 rc = -EOPNOTSUPP;
                 goto out_free;