summaryrefslogtreecommitdiffstats
path: root/arch/s390/kernel/head31.S
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2006-12-04 15:40:36 +0100
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2006-12-04 15:40:36 +0100
commitbaf2aeb3d9e286add823bcaea5442ad4ee34f6e4 (patch)
tree380cda8e4fee61880f5fb9992ee2c2f726a357e1 /arch/s390/kernel/head31.S
parent[S390] cpu shutdown rework (diff)
downloadlinux-baf2aeb3d9e286add823bcaea5442ad4ee34f6e4.tar.xz
linux-baf2aeb3d9e286add823bcaea5442ad4ee34f6e4.zip
[S390] Misaligned wait PSW at memory detection.
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>
Diffstat (limited to '')
-rw-r--r--arch/s390/kernel/head31.S3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/s390/kernel/head31.S b/arch/s390/kernel/head31.S
index 0a2c929486ab..adb082aeada6 100644
--- a/arch/s390/kernel/head31.S
+++ b/arch/s390/kernel/head31.S
@@ -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: