1 files changed, 2 insertions, 12 deletions

diff --git a/arch/s390/include/asm/ctl_reg.h b/arch/s390/include/asm/ctl_reg.h
index 31ab9f346d7e..cfad7fca01d6 100644
--- a/arch/s390/include/asm/ctl_reg.h
+++ b/arch/s390/include/asm/ctl_reg.h
@@ -9,20 +9,12 @@
 
 #include <linux/bug.h>
 
-#ifdef CONFIG_64BIT
-# define __CTL_LOAD     "lctlg"
-# define __CTL_STORE    "stctg"
-#else
-# define __CTL_LOAD     "lctl"
-# define __CTL_STORE    "stctl"
-#endif
-
 #define __ctl_load(array, low, high) {                                  \
         typedef struct { char _[sizeof(array)]; } addrtype;             \
                                                                         \
         BUILD_BUG_ON(sizeof(addrtype) != (high - low + 1) * sizeof(long));\
         asm volatile(                                                   \
-                __CTL_LOAD " %1,%2,%0\n"                                \
+                "       lctlg   %1,%2,%0\n"                             \
                 : : "Q" (*(addrtype *)(&array)), "i" (low), "i" (high));\
 }
 
@@ -31,7 +23,7 @@
                                                                         \
         BUILD_BUG_ON(sizeof(addrtype) != (high - low + 1) * sizeof(long));\
         asm volatile(                                                   \
-                __CTL_STORE " %1,%2,%0\n"                               \
+                "       stctg   %1,%2,%0\n"                             \
                 : "=Q" (*(addrtype *)(&array))                          \
                 : "i" (low), "i" (high));                               \
 }
@@ -60,9 +52,7 @@ void smp_ctl_clear_bit(int cr, int bit);
 union ctlreg0 {
         unsigned long val;
         struct {
-#ifdef CONFIG_64BIT
                 unsigned long      : 32;
-#endif
                 unsigned long      : 3;
                 unsigned long lap  : 1; /* Low-address-protection control */
                 unsigned long      : 4;