[PATCH 12/21] [PATCH] 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 <[email protected]>
---
 include/asm-x86/processor.h    |    8 ++++++++
 include/asm-x86/processor_32.h |    1 -
 include/asm-x86/processor_64.h |    8 --------
 3 files changed, 8 insertions(+), 9 deletions(-)

Index: linux-2.6-x86/include/asm-x86/processor.h
===================================================================
--- linux-2.6-x86.orig/include/asm-x86/processor.h
+++ linux-2.6-x86/include/asm-x86/processor.h
@@ -18,6 +18,14 @@ static inline void *current_text_addr(vo
 	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)
 {
Index: linux-2.6-x86/include/asm-x86/processor_32.h
===================================================================
--- linux-2.6-x86.orig/include/asm-x86/processor_32.h
+++ linux-2.6-x86/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,			\
Index: linux-2.6-x86/include/asm-x86/processor_64.h
===================================================================
--- linux-2.6-x86.orig/include/asm-x86/processor_64.h
+++ linux-2.6-x86/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) \
 }
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

---

• Follow-Ups:
  • [PATCH 13/21] [PATCH] change bitwise operations to get a void parameter.
    • From: Glauber de Oliveira Costa <[email protected]>

• References:
  • [PATCH 0/21] Integrate processor.h
    • From: Glauber de Oliveira Costa <[email protected]>
  • [PATCH 1/21] move tsc definitions to were they belong
    • From: Glauber de Oliveira Costa <[email protected]>
  • [PATCH 2/21] [PATCH] get rid of _MASK flags
    • From: Glauber de Oliveira Costa <[email protected]>
  • [PATCH 3/21] [PATCH] move desc_empty to where they belong
    • From: Glauber de Oliveira Costa <[email protected]>
  • [PATCH 4/21] [PATCH] move load_cr3 to a common place.
    • From: Glauber de Oliveira Costa <[email protected]>
  • [PATCH 5/21] [PATCH] unify paravirt pieces of processor.h
    • From: Glauber de Oliveira Costa <[email protected]>
  • [PATCH 6/21] [PATCH] move the definition of set_iopl_mask to common header
    • From: Glauber de Oliveira Costa <[email protected]>
  • [PATCH 7/21] [PATCH] unify common parts of processor.h
    • From: Glauber de Oliveira Costa <[email protected]>
  • [PATCH 8/21] [PATCH] unify current_text_addr
    • From: Glauber de Oliveira Costa <[email protected]>
  • [PATCH 9/21] [PATCH] unify tss_struct
    • From: Glauber de Oliveira Costa <[email protected]>
  • [PATCH 10/21] [PATCH] provide x86_64 with a load_sp0 function.
    • From: Glauber de Oliveira Costa <[email protected]>
  • [PATCH 11/21] [PATCH] unify thread struct.
    • From: Glauber de Oliveira Costa <[email protected]>

• Prev by Date: [PATCH 20/21] [PATCH] move i387 definitions to processor.h
• Next by Date: [PATCH 21/21] [PATCH] finish processor.h integration
• Previous by thread: [PATCH 11/21] [PATCH] unify thread struct.
• Next by thread: [PATCH 13/21] [PATCH] change bitwise operations to get a void parameter.
• Index(es):
  • Date
  • Thread

[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Stuff]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]     [Linux Resources]