diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-27 20:19:16 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-27 20:19:16 -0400 |
| commit | a83398570e17af6bb81eb94f4f5dd356bd2828d8 (patch) | |
| tree | 5b5c7c3a56898485479291b7c964a1f3887d469c /arch/s390/kernel/vmlinux.lds.S | |
| parent | f9384d41c02408dd404aa64d66d0ef38adcf6479 (diff) | |
| parent | 0b4d569de222452bcb55a4a536ade6cf4d8d1e30 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/s390/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/s390/kernel/vmlinux.lds.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S index d796d05c9c01..7a2063eb88f0 100644 --- a/arch/s390/kernel/vmlinux.lds.S +++ b/arch/s390/kernel/vmlinux.lds.S | |||
| @@ -108,6 +108,8 @@ SECTIONS | |||
| 108 | EXIT_TEXT | 108 | EXIT_TEXT |
| 109 | } | 109 | } |
| 110 | 110 | ||
| 111 | /* early.c uses stsi, which requires page aligned data. */ | ||
| 112 | . = ALIGN(PAGE_SIZE); | ||
| 111 | .init.data : { | 113 | .init.data : { |
| 112 | INIT_DATA | 114 | INIT_DATA |
| 113 | } | 115 | } |