diff options
| author |   Sam Ravnborg <sam@ravnborg.org> | 2009-04-29 09:47:19 +0200 |
|---|---|---|
| committer |   Ingo Molnar <mingo@elte.hu> | 2009-04-29 10:20:30 +0200 |
| commit | afb8095a7eab32e5760613fa73d2f80a39cc45bf (patch) | |
| tree | 10f8c58f380a907357f99cf612a0cf2463052de8 /arch/x86/kernel/vmlinux.lds.S | |
| parent | x86, vmlinux.lds: unify header/footer (diff) | |
| download | linux-dev-afb8095a7eab32e5760613fa73d2f80a39cc45bf.tar.xz linux-dev-afb8095a7eab32e5760613fa73d2f80a39cc45bf.zip | |
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.lds.S')
| -rw-r--r-- | arch/x86/kernel/vmlinux.lds.S | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S index d113642c1345..1a1b303a4272 100644 --- a/arch/x86/kernel/vmlinux.lds.S +++ b/arch/x86/kernel/vmlinux.lds.S @@ -40,6 +40,19 @@ ENTRY(phys_startup_64) jiffies_64 = jiffies; #endif +PHDRS { + text PT_LOAD FLAGS(5); /* R_E */ + data PT_LOAD FLAGS(7); /* RWE */ +#ifdef CONFIG_X86_64 + user PT_LOAD FLAGS(7); /* RWE */ + data.init PT_LOAD FLAGS(7); /* RWE */ +#ifdef CONFIG_SMP + percpu PT_LOAD FLAGS(7); /* RWE */ +#endif + data.init2 PT_LOAD FLAGS(7); /* RWE */ +#endif + note PT_NOTE FLAGS(0); /* ___ */ +} #ifdef CONFIG_X86_32 # include "vmlinux_32.lds.S" |