Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08269c6d authored by Andi Kleen's avatar Andi Kleen Committed by Andi Kleen
Browse files

[PATCH] x86: Fix gcc 4.2 _proxy_pda workaround 



Due to an over aggressive optimizer gcc 4.2 cannot optimize away _proxy_pda
in all cases (counter intuitive, but true).  This breaks loading of some
modules.

The earlier workaround to just export a dummy symbol didn't work unfortunately
because the module code ignores exports with 0 value.

Make it 1 instead.

Signed-off-by: default avatarAndi Kleen <ak@suse.de>
parent 94a05509

arch/i386/kernel/vmlinux.lds.S

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386") 
OUTPUT_ARCH(i386)

ENTRY(phys_startup_32)

jiffies = jiffies_64;

_proxy_pda = 0;

_proxy_pda = 1;



PHDRS {

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

arch/x86_64/kernel/vmlinux.lds.S

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64") 
OUTPUT_ARCH(i386:x86-64)

ENTRY(phys_startup_64)

jiffies_64 = jiffies;

_proxy_pda = 0;

_proxy_pda = 1;

PHDRS {

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

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