diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2009-04-29 03:47:20 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-04-29 04:20:30 -0400 |
commit | 444e0ae4831f99ba25062d9a5ccb7117c62841a0 (patch) | |
tree | 0c576648f98a8a11f42f0e293e9e3a3e693b039c /arch/x86/kernel/vmlinux.lds.S | |
parent | afb8095a7eab32e5760613fa73d2f80a39cc45bf (diff) |
x86, vmlinux.lds: unify start/end of SECTIONS
[ Impact: cleanup ]
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Tim Abbott <tabbott@MIT.EDU>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
LKML-Reference: <1240991249-27117-4-git-send-email-sam@ravnborg.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/vmlinux.lds.S')
-rw-r--r-- | arch/x86/kernel/vmlinux.lds.S | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S index 1a1b303a4272..845776fe5298 100644 --- a/arch/x86/kernel/vmlinux.lds.S +++ b/arch/x86/kernel/vmlinux.lds.S | |||
@@ -54,12 +54,26 @@ PHDRS { | |||
54 | note PT_NOTE FLAGS(0); /* ___ */ | 54 | note PT_NOTE FLAGS(0); /* ___ */ |
55 | } | 55 | } |
56 | 56 | ||
57 | SECTIONS | ||
58 | { | ||
59 | #ifdef CONFIG_X86_32 | ||
60 | . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR; | ||
61 | phys_startup_32 = startup_32 - LOAD_OFFSET; | ||
62 | #else | ||
63 | . = __START_KERNEL; | ||
64 | phys_startup_64 = startup_64 - LOAD_OFFSET; | ||
65 | #endif | ||
66 | |||
57 | #ifdef CONFIG_X86_32 | 67 | #ifdef CONFIG_X86_32 |
58 | # include "vmlinux_32.lds.S" | 68 | # include "vmlinux_32.lds.S" |
59 | #else | 69 | #else |
60 | # include "vmlinux_64.lds.S" | 70 | # include "vmlinux_64.lds.S" |
61 | #endif | 71 | #endif |
62 | 72 | ||
73 | STABS_DEBUG | ||
74 | DWARF_DEBUG | ||
75 | } | ||
76 | |||
63 | 77 | ||
64 | #ifdef CONFIG_X86_32 | 78 | #ifdef CONFIG_X86_32 |
65 | ASSERT((_end - LOAD_OFFSET <= KERNEL_IMAGE_SIZE), | 79 | ASSERT((_end - LOAD_OFFSET <= KERNEL_IMAGE_SIZE), |