2 files changed, 0 insertions, 9 deletions

diff --git a/arch/s390/kernel/head64.S b/arch/s390/kernel/head64.S
index f525c0c21250..28c50bdf7d40 100644
--- a/arch/s390/kernel/head64.S
+++ b/arch/s390/kernel/head64.S
@@ -658,10 +658,8 @@ startup:basr  %r13,0                     # get base
 #
         la     %r1,0f-.LPG1(%r13)       # set program check address
         stg    %r1,__LC_PGM_NEW_PSW+8
-        mvc    __LC_DIAG44_OPCODE(8),.Lnop-.LPG1(%r13)
         diag   0,0,0x44                 # test diag 0x44
         oi     7(%r12),32               # set diag44 flag
-        mvc    __LC_DIAG44_OPCODE(8),.Ldiag44-.LPG1(%r13)
 0:      
 
 #
@@ -702,7 +700,6 @@ startup:basr  %r13,0                     # get base
 .L4malign:.quad 0xffffffffffc00000
 .Lscan2g:.quad 0x80000000 + 0x20000 - 8 # 2GB + 128K - 8
 .Lnop:  .long  0x07000700
-.Ldiag44:.long 0x83000044
 
         .org PARMAREA-64
 .Lduct: .long 0,0,0,0,0,0,0,0
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index a12183989a79..5ba5a5485da9 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -431,12 +431,6 @@ setup_lowcore(void)
                 ctl_set_bit(14, 29);
         }
 #endif
-#ifdef CONFIG_ARCH_S390X
-        if (MACHINE_HAS_DIAG44)
-                lc->diag44_opcode = 0x83000044;
-        else
-                lc->diag44_opcode = 0x07000700;
-#endif /* CONFIG_ARCH_S390X */
         set_prefix((u32)(unsigned long) lc);
 }