Merge branch 'x86/asm' into x86/urgent

[karo-tx-linux.git] / arch / x86 / kernel / vmlinux.lds.S

diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index 8d2d0a271e233ed6c879abbd9b95a1617545b5be..92929fb3f9fa929acda8f0579570d2dea4ea942a 100644 (file)
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -45,9 +45,9 @@ PHDRS {
        text PT_LOAD FLAGS(5);          /* R_E */
        data PT_LOAD FLAGS(7);          /* RWE */
 #ifdef CONFIG_X86_64
-       user PT_LOAD FLAGS(7);          /* RWE */
+       user PT_LOAD FLAGS(5);          /* R_E */
 #ifdef CONFIG_SMP
-       percpu PT_LOAD FLAGS(7);        /* RWE */
+       percpu PT_LOAD FLAGS(6);        /* RW_ */
 #endif
        init PT_LOAD FLAGS(7);          /* RWE */
 #endif