diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2006-07-18 13:44:57 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2006-07-18 13:44:57 +0200 |
| commit | dc8f5d21dd6bdd94e5c5bf9bbcc616d00f0cc839 (patch) | |
| tree | 2ff887cc01285669caf20260f78df70bb3bec0a2 /arch/s390 | |
| parent | 53ba5e09fe37518683ff8b3f28410ce0b9ed2f74 (diff) | |
| download | op-kernel-dev-dc8f5d21dd6bdd94e5c5bf9bbcc616d00f0cc839.zip op-kernel-dev-dc8f5d21dd6bdd94e5c5bf9bbcc616d00f0cc839.tar.gz | |
[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>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/kernel/head31.S | 4 | ||||
| -rw-r--r-- | arch/s390/kernel/head64.S | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/s390/kernel/head31.S b/arch/s390/kernel/head31.S index d00de17..a4dc61f3 100644 --- a/arch/s390/kernel/head31.S +++ b/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/arch/s390/kernel/head64.S b/arch/s390/kernel/head64.S index 47744fc..9d80c5b 100644 --- a/arch/s390/kernel/head64.S +++ b/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 |
