Messages in this thread Patch in this message | | | Date | Tue, 18 Jul 2006 13:56:22 +0200 | From | Martin Schwidefsky <> | Subject | [patch 5/6] s390: .align 4096 statements in head.S |
| |
From: Heiko Carstens <heiko.carstens@de.ibm.com>
[S390] .align 4096 statements in head.S
SLES9 binutils don't like .align 4096 statements in head.S. Work around this by using .org statements.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> ---
arch/s390/kernel/head31.S | 4 ++-- arch/s390/kernel/head64.S | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
diff -urpN linux-2.6/arch/s390/kernel/head31.S linux-2.6-patched/arch/s390/kernel/head31.S --- linux-2.6/arch/s390/kernel/head31.S 2006-07-18 13:40:23.000000000 +0200 +++ linux-2.6-patched/arch/s390/kernel/head31.S 2006-07-18 13:40:46.000000000 +0200 @@ -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 -urpN linux-2.6/arch/s390/kernel/head64.S linux-2.6-patched/arch/s390/kernel/head64.S --- linux-2.6/arch/s390/kernel/head64.S 2006-07-18 13:40:23.000000000 +0200 +++ linux-2.6-patched/arch/s390/kernel/head64.S 2006-07-18 13:40:46.000000000 +0200 @@ -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 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |