Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6

[sfrench/cifs-2.6.git] / arch / s390 / kernel / head31.S

diff --git a/arch/s390/kernel/head31.S b/arch/s390/kernel/head31.S
index 453fd3b4edea6e59d8a2600f43d72af32c43b43f..da7c8bb80982cf66b0428697db07c23227d86d2e 100644 (file)
--- a/arch/s390/kernel/head31.S
+++ b/arch/s390/kernel/head31.S
@@ -148,20 +148,9 @@ startup_continue:
 .Lstartup_init:
            .long startup_init
 
-       .globl ipl_schib
-ipl_schib:
-       .rept 13
-       .long 0
-       .endr
-
-       .globl ipl_flags
-ipl_flags:
-       .long 0
-       .globl ipl_devno
-ipl_devno:
-       .word 0
-
        .org    0x12000
+       .globl  _ehead
+_ehead:
 #ifdef CONFIG_SHARED_KERNEL
        .org    0x100000
 #endif