From bc15358685222601d1731435fc813be866347e4d Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Tue, 18 Jul 2006 13:44:57 +0200 Subject: [PATCH] --- yaml --- r: 32717 b: refs/heads/master c: dc8f5d21dd6bdd94e5c5bf9bbcc616d00f0cc839 h: refs/heads/master i: 32715: 948baa5e56fa279bfa91ee061a5f8621904b64a1 v: v3 --- [refs] | 2 +- trunk/arch/s390/kernel/head31.S | 4 ++-- trunk/arch/s390/kernel/head64.S | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index dea2f5f509b3..86e47271a5c1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 53ba5e09fe37518683ff8b3f28410ce0b9ed2f74 +refs/heads/master: dc8f5d21dd6bdd94e5c5bf9bbcc616d00f0cc839 diff --git a/trunk/arch/s390/kernel/head31.S b/trunk/arch/s390/kernel/head31.S index d00de17b3778..a4dc61f3285e 100644 --- a/trunk/arch/s390/kernel/head31.S +++ b/trunk/arch/s390/kernel/head31.S @@ -273,7 +273,7 @@ startup_continue: .Lbss_end: .long _end .Lparmaddr: .long PARMAREA .Lsccbaddr: .long .Lsccb - .align 4096 + .org 0x12000 .Lsccb: .hword 0x1000 # length, one page .byte 0x00,0x00,0x00 @@ -290,7 +290,7 @@ startup_continue: .Lscpincr2: .quad 0x00 .fill 3984,1,0 - .align 4096 + .org 0x13000 #ifdef CONFIG_SHARED_KERNEL .org 0x100000 diff --git a/trunk/arch/s390/kernel/head64.S b/trunk/arch/s390/kernel/head64.S index 47744fcca930..9d80c5b1ef95 100644 --- a/trunk/arch/s390/kernel/head64.S +++ b/trunk/arch/s390/kernel/head64.S @@ -268,7 +268,7 @@ startup_continue: .Lparmaddr: .quad PARMAREA - .align 4096 + .org 0x12000 .Lsccb: .hword 0x1000 # length, one page .byte 0x00,0x00,0x00 @@ -285,7 +285,7 @@ startup_continue: .Lscpincr2: .quad 0x00 .fill 3984,1,0 - .align 4096 + .org 0x13000 #ifdef CONFIG_SHARED_KERNEL .org 0x100000