Commit afb8095a authored by Sam Ravnborg's avatar Sam Ravnborg Committed by Ingo Molnar
Browse files

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: default avatarSam 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: default avatarIngo Molnar <mingo@elte.hu>
parent 17ce265d

arch/x86/kernel/vmlinux.lds.S

+13 −0
Original line number Diff line number Diff line
@@ -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"

arch/x86/kernel/vmlinux_32.lds.S

+0 −5
Original line number Diff line number Diff line 
PHDRS {

	text PT_LOAD FLAGS(5);		/* R_E */

	data PT_LOAD FLAGS(7);		/* RWE */

	note PT_NOTE FLAGS(0);		/* ___ */

}

SECTIONS

{

	. = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;

arch/x86/kernel/vmlinux_64.lds.S

+0 −11
Original line number Diff line number Diff line 
PHDRS {

	text PT_LOAD FLAGS(5);		/* R_E */

	data PT_LOAD FLAGS(7);		/* RWE */

	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 */

	note PT_NOTE FLAGS(0);		/* ___ */

}

SECTIONS

{

	. = __START_KERNEL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE