aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlauber de Oliveira Costa <gcosta@redhat.com>2008-01-30 13:31:31 +0100
committerIngo Molnar <mingo@elte.hu>2008-01-30 13:31:31 +0100
commitdbcb4660246c240a159b4037067fdedb563a63cb (patch)
treea6f7bbbd1165c14a245bfb6485302b97c6093d2e
parentcb38d377337cadd73fe4c582f77c5273685aeb71 (diff)
x86: unify TASK_ALIGN definitions
This patch moves the TASK_ALIGN constraints to common header. The base of it is the same for x86_64 and i386. The only difference is the presence of vSMP in x86_64. As it's not a worry in i386, we can safely use the same code for both. Signed-off-by: Glauber de Oliveira Costa <gcosta@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--include/asm-x86/processor.h8
-rw-r--r--include/asm-x86/processor_32.h1
-rw-r--r--include/asm-x86/processor_64.h8
3 files changed, 8 insertions, 9 deletions
diff --git a/include/asm-x86/processor.h b/include/asm-x86/processor.h
index 0e82ad5a22a..8b56c23f043 100644
--- a/include/asm-x86/processor.h
+++ b/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/include/asm-x86/processor_32.h b/include/asm-x86/processor_32.h
index 8cb05cec3cb..8380243a19d 100644
--- a/include/asm-x86/processor_32.h
+++ b/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/include/asm-x86/processor_64.h b/include/asm-x86/processor_64.h
index 4b4ec3d7991..7fe5c1461c8 100644
--- a/include/asm-x86/processor_64.h
+++ b/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) \
}