1 files changed, 0 insertions, 10 deletions

diff --git a/arch/s390/kernel/cpcmd.c b/arch/s390/kernel/cpcmd.c
index d7b0c4d27880..199ec92ef4fe 100644
--- a/arch/s390/kernel/cpcmd.c
+++ b/arch/s390/kernel/cpcmd.c
@@ -27,13 +27,9 @@ static int diag8_noresponse(int cmdlen)
         register unsigned long reg3 asm ("3") = cmdlen;
 
         asm volatile(
-#ifndef CONFIG_64BIT
-                "       diag    %1,%0,0x8\n"
-#else /* CONFIG_64BIT */
                 "       sam31\n"
                 "       diag    %1,%0,0x8\n"
                 "       sam64\n"
-#endif /* CONFIG_64BIT */
                 : "+d" (reg3) : "d" (reg2) : "cc");
         return reg3;
 }
@@ -46,17 +42,11 @@ static int diag8_response(int cmdlen, char *response, int *rlen)
         register unsigned long reg5 asm ("5") = *rlen;
 
         asm volatile(
-#ifndef CONFIG_64BIT
-                "       diag    %2,%0,0x8\n"
-                "       brc     8,1f\n"
-                "       ar      %1,%4\n"
-#else /* CONFIG_64BIT */
                 "       sam31\n"
                 "       diag    %2,%0,0x8\n"
                 "       sam64\n"
                 "       brc     8,1f\n"
                 "       agr     %1,%4\n"
-#endif /* CONFIG_64BIT */
                 "1:\n"
                 : "+d" (reg4), "+d" (reg5)
                 : "d" (reg2), "d" (reg3), "d" (*rlen) : "cc");