]> err.no Git - linux-2.6/commitdiff
[S390] Misaligned wait PSW at memory detection.
authorHeiko Carstens <heiko.carstens@de.ibm.com>
Mon, 4 Dec 2006 14:40:36 +0000 (15:40 +0100)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>
Mon, 4 Dec 2006 14:40:36 +0000 (15:40 +0100)
If the memory detection code would ever reach the point where it would
load the wait psw, it would generate a specification exception and the
system would crash at ipl time. This is because of a misaligned wait
psw. It needs to be on a double word boundary instead of a word
boundary.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
arch/s390/kernel/head31.S

index 0a2c929486abf0ab96b361be6396f546e5e20e7b..adb082aeada65e975750b4cd35ffe6b6d2e4e2f3 100644 (file)
@@ -131,10 +131,11 @@ startup_continue:
        .long   init_thread_union
 .Lpmask:
        .byte   0
-.align 8
+       .align  8
 .Lpcext:.long  0x00080000,0x80000000
 .Lcr:
        .long   0x00                    # place holder for cr0
+       .align  8
 .Lwaitsclp:
        .long 0x010a0000,0x80000000 + .Lsclph
 .Lrcp: