diff options
author | Cyrill Gorcunov <gorcunov@gmail.com> | 2008-07-17 15:16:11 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-20 20:24:38 -0400 |
commit | 97d26e73d729c8d967bc5eb9086321956c444dd4 (patch) | |
tree | 01592b1319fcf91b71bd8430e00696f8f9e051b2 /arch/m68k/kernel | |
parent | e945b568e28b42de893ef24989372f0219501d32 (diff) |
m68k: vmlinux-std/sun3.lds.S cleanup - use PAGE_SIZE macro
This patch includes page.h header into linker script that
allow us to use PAGE_SIZE macro instead of numeric constant
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/m68k/kernel')
-rw-r--r-- | arch/m68k/kernel/vmlinux-std.lds | 3 | ||||
-rw-r--r-- | arch/m68k/kernel/vmlinux-sun3.lds | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/arch/m68k/kernel/vmlinux-std.lds b/arch/m68k/kernel/vmlinux-std.lds index 7537cc5e6159..99b0784c0552 100644 --- a/arch/m68k/kernel/vmlinux-std.lds +++ b/arch/m68k/kernel/vmlinux-std.lds | |||
@@ -1,6 +1,7 @@ | |||
1 | /* ld script to make m68k Linux kernel */ | 1 | /* ld script to make m68k Linux kernel */ |
2 | 2 | ||
3 | #include <asm-generic/vmlinux.lds.h> | 3 | #include <asm-generic/vmlinux.lds.h> |
4 | #include <asm/page.h> | ||
4 | 5 | ||
5 | OUTPUT_FORMAT("elf32-m68k", "elf32-m68k", "elf32-m68k") | 6 | OUTPUT_FORMAT("elf32-m68k", "elf32-m68k", "elf32-m68k") |
6 | OUTPUT_ARCH(m68k) | 7 | OUTPUT_ARCH(m68k) |
@@ -41,7 +42,7 @@ SECTIONS | |||
41 | _edata = .; /* End of data section */ | 42 | _edata = .; /* End of data section */ |
42 | 43 | ||
43 | /* will be freed after init */ | 44 | /* will be freed after init */ |
44 | . = ALIGN(4096); /* Init code and data */ | 45 | . = ALIGN(PAGE_SIZE); /* Init code and data */ |
45 | __init_begin = .; | 46 | __init_begin = .; |
46 | .init.text : { | 47 | .init.text : { |
47 | _sinittext = .; | 48 | _sinittext = .; |
diff --git a/arch/m68k/kernel/vmlinux-sun3.lds b/arch/m68k/kernel/vmlinux-sun3.lds index cdc313e7c299..8a4919e4d36a 100644 --- a/arch/m68k/kernel/vmlinux-sun3.lds +++ b/arch/m68k/kernel/vmlinux-sun3.lds | |||
@@ -1,6 +1,7 @@ | |||
1 | /* ld script to make m68k Linux kernel */ | 1 | /* ld script to make m68k Linux kernel */ |
2 | 2 | ||
3 | #include <asm-generic/vmlinux.lds.h> | 3 | #include <asm-generic/vmlinux.lds.h> |
4 | #include <asm/page.h> | ||
4 | 5 | ||
5 | OUTPUT_FORMAT("elf32-m68k", "elf32-m68k", "elf32-m68k") | 6 | OUTPUT_FORMAT("elf32-m68k", "elf32-m68k", "elf32-m68k") |
6 | OUTPUT_ARCH(m68k) | 7 | OUTPUT_ARCH(m68k) |
@@ -34,7 +35,7 @@ SECTIONS | |||
34 | _edata = .; | 35 | _edata = .; |
35 | 36 | ||
36 | /* will be freed after init */ | 37 | /* will be freed after init */ |
37 | . = ALIGN(8192); /* Init code and data */ | 38 | . = ALIGN(PAGE_SIZE); /* Init code and data */ |
38 | __init_begin = .; | 39 | __init_begin = .; |
39 | .init.text : { | 40 | .init.text : { |
40 | _sinittext = .; | 41 | _sinittext = .; |
@@ -61,12 +62,12 @@ __init_begin = .; | |||
61 | } | 62 | } |
62 | SECURITY_INIT | 63 | SECURITY_INIT |
63 | #ifdef CONFIG_BLK_DEV_INITRD | 64 | #ifdef CONFIG_BLK_DEV_INITRD |
64 | . = ALIGN(8192); | 65 | . = ALIGN(PAGE_SIZE); |
65 | __initramfs_start = .; | 66 | __initramfs_start = .; |
66 | .init.ramfs : { *(.init.ramfs) } | 67 | .init.ramfs : { *(.init.ramfs) } |
67 | __initramfs_end = .; | 68 | __initramfs_end = .; |
68 | #endif | 69 | #endif |
69 | . = ALIGN(8192); | 70 | . = ALIGN(PAGE_SIZE); |
70 | __init_end = .; | 71 | __init_end = .; |
71 | .data.init.task : { *(.data.init_task) } | 72 | .data.init.task : { *(.data.init_task) } |
72 | 73 | ||