diff options
| author | Tim Abbott <tabbott@ksplice.com> | 2009-10-18 13:23:49 -0400 |
|---|---|---|
| committer | Greg Ungerer <gerg@goober.(none)> | 2009-12-03 20:45:31 -0500 |
| commit | f4bed4fb17417085d00e4fd1dc285db0330e5945 (patch) | |
| tree | 088de452f025640b51f6b0a4662c95736f3b5f27 /arch | |
| parent | 10f204e5ad4e0c72aa007c00cb76c1d5a577032d (diff) | |
m68knommu: Don't hardcode the value of PAGE_SIZE in the linker script.
Signed-off-by: Tim Abbott <tabbott@ksplice.com>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/m68knommu/kernel/vmlinux.lds.S | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/m68knommu/kernel/vmlinux.lds.S b/arch/m68knommu/kernel/vmlinux.lds.S index 6e10d25f872d..a0108fd6d341 100644 --- a/arch/m68knommu/kernel/vmlinux.lds.S +++ b/arch/m68knommu/kernel/vmlinux.lds.S | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <asm-generic/vmlinux.lds.h> | 10 | #include <asm-generic/vmlinux.lds.h> |
| 11 | #include <asm/page.h> | ||
| 11 | 12 | ||
| 12 | #if defined(CONFIG_RAMKERNEL) | 13 | #if defined(CONFIG_RAMKERNEL) |
| 13 | #define RAM_START CONFIG_KERNELBASE | 14 | #define RAM_START CONFIG_KERNELBASE |
| @@ -155,7 +156,7 @@ SECTIONS { | |||
| 155 | } > DATA | 156 | } > DATA |
| 156 | 157 | ||
| 157 | .init : { | 158 | .init : { |
| 158 | . = ALIGN(4096); | 159 | . = ALIGN(PAGE_SIZE); |
| 159 | __init_begin = .; | 160 | __init_begin = .; |
| 160 | _sinittext = .; | 161 | _sinittext = .; |
| 161 | INIT_TEXT | 162 | INIT_TEXT |
| @@ -180,7 +181,7 @@ SECTIONS { | |||
| 180 | *(.init.ramfs) | 181 | *(.init.ramfs) |
| 181 | __initramfs_end = .; | 182 | __initramfs_end = .; |
| 182 | #endif | 183 | #endif |
| 183 | . = ALIGN(4096); | 184 | . = ALIGN(PAGE_SIZE); |
| 184 | __init_end = .; | 185 | __init_end = .; |
| 185 | } > INIT | 186 | } > INIT |
| 186 | 187 | ||