From 304e03cc34fa2bd7e71ad2b6a5495666281e1033 Mon Sep 17 00:00:00 2001
From: Glauber de Oliveira Costa <gcosta@redhat.com>
Date: Wed, 30 Jan 2008 13:31:31 +0100
Subject: [PATCH] --- yaml --- r: 80038 b: refs/heads/master c:
 dbcb4660246c240a159b4037067fdedb563a63cb h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/include/asm-x86/processor.h    | 8 ++++++++
 trunk/include/asm-x86/processor_32.h | 1 -
 trunk/include/asm-x86/processor_64.h | 8 --------
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 8169d8fd9862..b9850bb1b750 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb38d377337cadd73fe4c582f77c5273685aeb71
+refs/heads/master: dbcb4660246c240a159b4037067fdedb563a63cb
diff --git a/trunk/include/asm-x86/processor.h b/trunk/include/asm-x86/processor.h
index 0e82ad5a22a4..8b56c23f043d 100644
--- a/trunk/include/asm-x86/processor.h
+++ b/trunk/include/asm-x86/processor.h
@@ -22,6 +22,14 @@ static inline void *current_text_addr(void)
 	return pc;
 }
 
+#ifdef CONFIG_X86_VSMP
+#define ARCH_MIN_TASKALIGN	(1 << INTERNODE_CACHE_SHIFT)
+#define ARCH_MIN_MMSTRUCT_ALIGN	(1 << INTERNODE_CACHE_SHIFT)
+#else
+#define ARCH_MIN_TASKALIGN	16
+#define ARCH_MIN_MMSTRUCT_ALIGN	0
+#endif
+
 static inline void native_cpuid(unsigned int *eax, unsigned int *ebx,
 					 unsigned int *ecx, unsigned int *edx)
 {
diff --git a/trunk/include/asm-x86/processor_32.h b/trunk/include/asm-x86/processor_32.h
index 8cb05cec3cb9..8380243a19d3 100644
--- a/trunk/include/asm-x86/processor_32.h
+++ b/trunk/include/asm-x86/processor_32.h
@@ -174,7 +174,6 @@ typedef struct {
 	unsigned long seg;
 } mm_segment_t;
 
-#define ARCH_MIN_TASKALIGN	16
 
 #define INIT_THREAD  {							\
 	.sp0 = sizeof(init_stack) + (long)&init_stack,			\
diff --git a/trunk/include/asm-x86/processor_64.h b/trunk/include/asm-x86/processor_64.h
index 4b4ec3d79910..7fe5c1461c83 100644
--- a/trunk/include/asm-x86/processor_64.h
+++ b/trunk/include/asm-x86/processor_64.h
@@ -117,14 +117,6 @@ struct orig_ist {
 };
 DECLARE_PER_CPU(struct orig_ist, orig_ist);
 
-#ifdef CONFIG_X86_VSMP
-#define ARCH_MIN_TASKALIGN	(1 << INTERNODE_CACHE_SHIFT)
-#define ARCH_MIN_MMSTRUCT_ALIGN	(1 << INTERNODE_CACHE_SHIFT)
-#else
-#define ARCH_MIN_TASKALIGN	16
-#define ARCH_MIN_MMSTRUCT_ALIGN	0
-#endif
-
 #define INIT_THREAD  { \
 	.sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
 }