diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2009-04-29 03:47:19 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-29 04:20:30 -0400 |
| commit | afb8095a7eab32e5760613fa73d2f80a39cc45bf (patch) | |
| tree | 10f8c58f380a907357f99cf612a0cf2463052de8 /arch/x86/kernel/vmlinux_32.lds.S | |
| parent | 17ce265d6a1789eae5eb739a3bb7fcffdb3e87c5 (diff) | |
x86, vmlinux.lds: unify PHDRS
PHDRS are not equal for the two - so
use ifdefs to cover up for that.
On the assumption that they may become equal the ifdef
is inside the PHDRS definiton.
[ 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-3-git-send-email-sam@ravnborg.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/vmlinux_32.lds.S')
| -rw-r--r-- | arch/x86/kernel/vmlinux_32.lds.S | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/x86/kernel/vmlinux_32.lds.S b/arch/x86/kernel/vmlinux_32.lds.S index 4c985fcd9ab4..4fd40dc50172 100644 --- a/arch/x86/kernel/vmlinux_32.lds.S +++ b/arch/x86/kernel/vmlinux_32.lds.S | |||
| @@ -1,8 +1,3 @@ | |||
| 1 | PHDRS { | ||
| 2 | text PT_LOAD FLAGS(5); /* R_E */ | ||
| 3 | data PT_LOAD FLAGS(7); /* RWE */ | ||
| 4 | note PT_NOTE FLAGS(0); /* ___ */ | ||
| 5 | } | ||
| 6 | SECTIONS | 1 | SECTIONS |
| 7 | { | 2 | { |
| 8 | . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR; | 3 | . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR; |