diff options
author | Haavard Skinnemoen <hskinnemoen@atmel.com> | 2007-09-17 05:08:28 -0400 |
---|---|---|
committer | Haavard Skinnemoen <hskinnemoen@atmel.com> | 2007-10-11 06:16:56 -0400 |
commit | 7cf6ac2ae240e02ebdd2717a09d083d47cb60251 (patch) | |
tree | 16aabe70b62bb6a0d548b5d4f03c17c4940f14fd /arch/avr32/kernel | |
parent | 4e59629bf68e8a6f19b806f8ace3d0f31221c4a4 (diff) |
[AVR32] Kill a few hardcoded constants in vmlinux.lds
Use PAGE_SIZE, THREAD_SIZE and L1_CACHE_BYTES instead of harcoded
constants in places where that's what we really mean.
Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
Diffstat (limited to 'arch/avr32/kernel')
-rw-r--r-- | arch/avr32/kernel/vmlinux.lds.S | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/avr32/kernel/vmlinux.lds.S b/arch/avr32/kernel/vmlinux.lds.S index db0438f35c00..fef0e6d322f1 100644 --- a/arch/avr32/kernel/vmlinux.lds.S +++ b/arch/avr32/kernel/vmlinux.lds.S | |||
@@ -9,6 +9,8 @@ | |||
9 | */ | 9 | */ |
10 | #define LOAD_OFFSET 0x00000000 | 10 | #define LOAD_OFFSET 0x00000000 |
11 | #include <asm-generic/vmlinux.lds.h> | 11 | #include <asm-generic/vmlinux.lds.h> |
12 | #include <asm/cache.h> | ||
13 | #include <asm/thread_info.h> | ||
12 | 14 | ||
13 | OUTPUT_FORMAT("elf32-avr32", "elf32-avr32", "elf32-avr32") | 15 | OUTPUT_FORMAT("elf32-avr32", "elf32-avr32", "elf32-avr32") |
14 | OUTPUT_ARCH(avr32) | 16 | OUTPUT_ARCH(avr32) |
@@ -58,7 +60,7 @@ SECTIONS | |||
58 | *(.init.ramfs) | 60 | *(.init.ramfs) |
59 | __initramfs_end = .; | 61 | __initramfs_end = .; |
60 | #endif | 62 | #endif |
61 | . = ALIGN(4096); | 63 | . = ALIGN(PAGE_SIZE); |
62 | __init_end = .; | 64 | __init_end = .; |
63 | } | 65 | } |
64 | 66 | ||
@@ -96,7 +98,7 @@ SECTIONS | |||
96 | 98 | ||
97 | RODATA | 99 | RODATA |
98 | 100 | ||
99 | . = ALIGN(8192); | 101 | . = ALIGN(THREAD_SIZE); |
100 | 102 | ||
101 | .data : AT(ADDR(.data) - LOAD_OFFSET) { | 103 | .data : AT(ADDR(.data) - LOAD_OFFSET) { |
102 | _data = .; | 104 | _data = .; |
@@ -107,7 +109,7 @@ SECTIONS | |||
107 | *(.data.init_task) | 109 | *(.data.init_task) |
108 | 110 | ||
109 | /* Then, the cacheline aligned data */ | 111 | /* Then, the cacheline aligned data */ |
110 | . = ALIGN(32); | 112 | . = ALIGN(L1_CACHE_BYTES); |
111 | *(.data.cacheline_aligned) | 113 | *(.data.cacheline_aligned) |
112 | 114 | ||
113 | /* And the rest... */ | 115 | /* And the rest... */ |