crypto: s390/ghash - Fix incorrect ghash icv buffer handling.

[karo-tx-linux.git] / arch / s390 / mm / extmem.c

diff --git a/arch/s390/mm/extmem.c b/arch/s390/mm/extmem.c
index 519bba716cc30c29acbb74f7cfd30db876af170c..23c496957c2232a88ac14d690b00f2004fd8ada9 100644 (file)
--- 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;