diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-31 08:59:59 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-31 08:59:59 -0400 |
| commit | b1b934d31d8a608fe69fc56d6e539548b55b0601 (patch) | |
| tree | e8206589759c732a3a9b70b3feeb9ef50dc3c6b3 /arch/s390/kernel/head64.S | |
| parent | 5dd9feafb351a8bf304292623cbc63335c34d279 (diff) | |
| parent | b6ff50833ad43a8ebd9b16bf53c334f7aaf33c41 (diff) | |
| download | kernel_samsung_smdk4412-b1b934d31d8a608fe69fc56d6e539548b55b0601.zip kernel_samsung_smdk4412-b1b934d31d8a608fe69fc56d6e539548b55b0601.tar.gz kernel_samsung_smdk4412-b1b934d31d8a608fe69fc56d6e539548b55b0601.tar.bz2 | |
Merge branch 'master'
Diffstat (limited to 'arch/s390/kernel/head64.S')
| -rw-r--r-- | arch/s390/kernel/head64.S | 4 |
1 files changed, 2 insertions, 2 deletions
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 |