From 265146f4a04d7fb52e26b0fb9d3d1c96b58db912 Mon Sep 17 00:00:00 2001
From: Alexey Dobriyan <adobriyan@gmail.com>
Date: Mon, 4 May 2009 03:29:52 +0400
Subject: [PATCH] --- yaml --- r: 145723 b: refs/heads/master c:
 d756f4adb9d8a86e347a2d5435bb5cc95744733e h: refs/heads/master i:   145721:
 f9f78108938cd0f10cc5be65b028465e65e4e738   145719:
 49ef9e94449dc310a23c52798e86d066fd29c613 v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/x86/include/asm/processor.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8dbe98fc8fbe..ddc4efc8e8c6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: edc953fa4ebc0265ef3b1754fe116a9fd4264e15
+refs/heads/master: d756f4adb9d8a86e347a2d5435bb5cc95744733e
diff --git a/trunk/arch/x86/include/asm/processor.h b/trunk/arch/x86/include/asm/processor.h
index c2cceae709c8..a6732ff7b016 100644
--- a/trunk/arch/x86/include/asm/processor.h
+++ b/trunk/arch/x86/include/asm/processor.h
@@ -428,7 +428,9 @@ struct thread_struct {
 	unsigned short		gsindex;
 #endif
 	unsigned long		ip;
+#ifdef CONFIG_X86_64
 	unsigned long		fs;
+#endif
 	unsigned long		gs;
 	/* Hardware debugging registers: */
 	unsigned long		debugreg0;
@@ -874,7 +876,6 @@ static inline void spin_lock_prefetch(const void *x)
 	.vm86_info		= NULL,					  \
 	.sysenter_cs		= __KERNEL_CS,				  \
 	.io_bitmap_ptr		= NULL,					  \
-	.fs			= __KERNEL_PERCPU,			  \
 }
 
 /*