Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dbcb4660 authored by Glauber de Oliveira Costa's avatar Glauber de Oliveira Costa Committed by Ingo Molnar
Browse files

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: default avatarGlauber de Oliveira Costa <gcosta@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent cb38d377

include/asm-x86/processor.h

+8 −0
Original line number Diff line number Diff line
@@ -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)

{

include/asm-x86/processor_32.h

+0 −1
Original line number Diff line number Diff line
@@ -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,			\

include/asm-x86/processor_64.h

+0 −8
Original line number Diff line number Diff line
@@ -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) \

}