From c35dc92f1f1aa6cd2ec6c0c849c82521794f78b1 Mon Sep 17 00:00:00 2001
From: Jan Beulich <JBeulich@novell.com>
Date: Fri, 4 Sep 2009 09:18:07 +0100
Subject: [PATCH] --- yaml --- r: 164305 b: refs/heads/master c:
 8d0cc631f6dd0a9283ceb7d61d8b85ecbcd355ea h: refs/heads/master i:   164303:
 42790c9f221181c3e16054b8f5c6220d566f4140 v: v3

---
 [refs]                              | 2 +-
 trunk/arch/x86/kernel/vmlinux.lds.S | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 34169665f31d..86b636ca95f4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f68563996e812f9ca35b3939ad2a42e5d254d66
+refs/heads/master: 8d0cc631f6dd0a9283ceb7d61d8b85ecbcd355ea
diff --git a/trunk/arch/x86/kernel/vmlinux.lds.S b/trunk/arch/x86/kernel/vmlinux.lds.S
index 0ccb57d5ee35..a46acccec38a 100644
--- a/trunk/arch/x86/kernel/vmlinux.lds.S
+++ b/trunk/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