]> pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - arch/s390/kernel/head31.S
Merge branch 'x86/um-header' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...
[linux-2.6-omap-h63xx.git] / arch / s390 / kernel / head31.S
index 453fd3b4edea6e59d8a2600f43d72af32c43b43f..a816e2de32b957ce24af24a2e0f45163e3d8e4da 100644 (file)
@@ -57,61 +57,6 @@ startup_continue:
 #
        l       %r14,.Lstartup_init-.LPG1(%r13)
        basr    %r14,%r14
-
-       l       %r12,.Lmflags-.LPG1(%r13) # get address of machine_flags
-#
-# find out if we have an IEEE fpu
-#
-       mvc     __LC_PGM_NEW_PSW(8),.Lpcfpu-.LPG1(%r13)
-       efpc    %r0,0                   # test IEEE extract fpc instruction
-       oi      3(%r12),2               # set IEEE fpu flag
-.Lchkfpu:
-
-#
-# find out if we have the CSP instruction
-#
-       mvc      __LC_PGM_NEW_PSW(8),.Lpccsp-.LPG1(%r13)
-       la       %r0,0
-       lr      %r1,%r0
-       la      %r2,4
-       csp     %r0,%r2                 # Test CSP instruction
-       oi      3(%r12),8               # set CSP flag
-.Lchkcsp:
-
-#
-# find out if we have the MVPG instruction
-#
-       mvc     __LC_PGM_NEW_PSW(8),.Lpcmvpg-.LPG1(%r13)
-       sr      %r0,%r0
-       la      %r1,0
-       la      %r2,0
-       mvpg    %r1,%r2                 # Test CSP instruction
-       oi      3(%r12),16              # set MVPG flag
-.Lchkmvpg:
-
-#
-# find out if we have the IDTE instruction
-#
-       mvc     __LC_PGM_NEW_PSW(8),.Lpcidte-.LPG1(%r13)
-       .long   0xb2b10000              # store facility list
-       tm      0xc8,0x08               # check bit for clearing-by-ASCE
-       bno     .Lchkidte-.LPG1(%r13)
-       lhi     %r1,2094
-       lhi     %r2,0
-       .long   0xb98e2001
-       oi      3(%r12),0x80            # set IDTE flag
-.Lchkidte:
-
-#
-# find out if the diag 0x9c is available
-#
-       mvc     __LC_PGM_NEW_PSW(8),.Lpcdiag9c-.LPG1(%r13)
-       stap    __LC_CPUID+4            # store cpu address
-       lh      %r1,__LC_CPUID+4
-       diag    %r1,0,0x9c              # test diag 0x9c
-       oi      2(%r12),1               # set diag9c flag
-.Lchkdiag9c:
-
        lpsw  .Lentry-.LPG1(13)         # jump to _stext in primary-space,
                                        # virtual and never return ...
        .align  8
@@ -121,7 +66,7 @@ startup_continue:
        .long   .Lduct                  # cr2: dispatchable unit control table
        .long   0                       # cr3: instruction authorization
        .long   0                       # cr4: instruction authorization
-       .long   0xffffffff              # cr5: primary-aste origin
+       .long   .Lduct                  # cr5: primary-aste origin
        .long   0                       # cr6:  I/O interrupts
        .long   0                       # cr7:  secondary space segment table
        .long   0                       # cr8:  access registers translation
@@ -132,36 +77,24 @@ startup_continue:
        .long   0                       # cr13: home space segment table
        .long   0xc0000000              # cr14: machine check handling off
        .long   0                       # cr15: linkage stack operations
-.Lduct:        .long   0,0,0,0,0,0,0,0
-       .long   0,0,0,0,0,0,0,0
-.Lpcfpu:.long  0x00080000,0x80000000 + .Lchkfpu
-.Lpccsp:.long  0x00080000,0x80000000 + .Lchkcsp
-.Lpcmvpg:.long 0x00080000,0x80000000 + .Lchkmvpg
-.Lpcidte:.long 0x00080000,0x80000000 + .Lchkidte
-.Lpcdiag9c:.long 0x00080000,0x80000000 + .Lchkdiag9c
 .Lmchunk:.long memory_chunk
-.Lmflags:.long machine_flags
 .Lbss_bgn:  .long __bss_start
 .Lbss_end:  .long _end
 .Lparmaddr: .long PARMAREA
 .Linittu:   .long init_thread_union
 .Lstartup_init:
            .long startup_init
-
-       .globl ipl_schib
-ipl_schib:
-       .rept 13
-       .long 0
+       .align  64
+.Lduct:        .long   0,0,0,0,.Lduald,0,0,0
+       .long   0,0,0,0,0,0,0,0
+       .align  128
+.Lduald:.rept  8
+       .long   0x80000000,0,0,0        # invalid access-list entries
        .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