Commit 4369f1fb authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'tj-percpu' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into core/percpu 



Conflicts:
	arch/x86/kernel/setup_percpu.c

Semantic conflict:

	arch/x86/kernel/cpu/common.c

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 3ddeb51d cf3997f5

arch/x86/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ config ARCH_HAS_CACHE_LINE_SIZE 
	def_bool y



config HAVE_SETUP_PER_CPU_AREA

	def_bool X86_64_SMP || (X86_SMP && !X86_VOYAGER)

	def_bool y



config HAVE_CPUMASK_OF_CPU_MAP

	def_bool X86_64_SMP

arch/x86/include/asm/cpumask.h

+4 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ extern cpumask_var_t cpu_callout_mask; 
extern cpumask_var_t cpu_initialized_mask;

extern cpumask_var_t cpu_sibling_setup_mask;



extern void setup_cpu_local_masks(void);



#else /* CONFIG_X86_32 */



extern cpumask_t cpu_callin_map;
@@ -22,6 +24,8 @@ extern cpumask_t cpu_sibling_setup_map; 
#define cpu_initialized_mask	((struct cpumask *)&cpu_initialized)

#define cpu_sibling_setup_mask	((struct cpumask *)&cpu_sibling_setup_map)



static inline void setup_cpu_local_masks(void) { }



#endif /* CONFIG_X86_32 */



#endif /* __ASSEMBLY__ */

arch/x86/include/asm/processor.h

+0 −9
Original line number Diff line number Diff line
@@ -394,14 +394,6 @@ union irq_stack_union { 


DECLARE_PER_CPU(union irq_stack_union, irq_stack_union);

DECLARE_PER_CPU(char *, irq_stack_ptr);



static inline void load_gs_base(int cpu)

{

	/* Memory clobbers used to order pda/percpu accesses */

	mb();

	wrmsrl(MSR_GS_BASE, (unsigned long)per_cpu(irq_stack_union.gs_base, cpu));

	mb();

}

#endif



extern void print_cpu_info(struct cpuinfo_x86 *);
@@ -778,7 +770,6 @@ extern struct desc_ptr early_gdt_descr; 
extern void cpu_set_gdt(int);

extern void switch_to_new_gdt(void);

extern void cpu_init(void);

extern void init_gdt(int cpu);



static inline unsigned long get_debugctlmsr(void)

{

arch/x86/include/asm/topology.h

+6 −0
Original line number Diff line number Diff line
@@ -74,6 +74,8 @@ static inline const struct cpumask *cpumask_of_node(int node) 
	return &node_to_cpumask_map[node];

}



static inline void setup_node_to_cpumask_map(void) { }



#else /* CONFIG_X86_64 */



/* Mappings between node number and cpus on that node. */
@@ -120,6 +122,8 @@ static inline cpumask_t node_to_cpumask(int node) 


#endif /* !CONFIG_DEBUG_PER_CPU_MAPS */



extern void setup_node_to_cpumask_map(void);



/*

 * Replace default node_to_cpumask_ptr with optimized version

 * Deprecated: use "const struct cpumask *mask = cpumask_of_node(node)"
@@ -218,6 +222,8 @@ static inline int node_to_first_cpu(int node) 
	return first_cpu(cpu_online_map);

}



static inline void setup_node_to_cpumask_map(void) { }



/*

 * Replace default node_to_cpumask_ptr with optimized version

 * Deprecated: use "const struct cpumask *mask = cpumask_of_node(node)"

arch/x86/kernel/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ CFLAGS_paravirt.o := $(nostackp) 
obj-y			:= process_$(BITS).o signal.o entry_$(BITS).o

obj-y			+= traps.o irq.o irq_$(BITS).o dumpstack_$(BITS).o

obj-y			+= time_$(BITS).o ioport.o ldt.o dumpstack.o

obj-y			+= setup.o i8259.o irqinit_$(BITS).o setup_percpu.o

obj-y			+= setup.o i8259.o irqinit_$(BITS).o

obj-$(CONFIG_X86_VISWS)	+= visws_quirks.o

obj-$(CONFIG_X86_32)	+= probe_roms_32.o

obj-$(CONFIG_X86_32)	+= sys_i386_32.o i386_ksyms_32.o
@@ -59,8 +59,8 @@ apm-y := apm_32.o 
obj-$(CONFIG_APM)		+= apm.o

obj-$(CONFIG_X86_SMP)		+= smp.o

obj-$(CONFIG_X86_SMP)		+= smpboot.o tsc_sync.o ipi.o

obj-$(CONFIG_X86_32_SMP)	+= smpcommon.o

obj-$(CONFIG_X86_64_SMP)	+= tsc_sync.o smpcommon.o

obj-$(CONFIG_SMP)		+= setup_percpu.o

obj-$(CONFIG_X86_64_SMP)	+= tsc_sync.o

obj-$(CONFIG_X86_TRAMPOLINE)	+= trampoline_$(BITS).o

obj-$(CONFIG_X86_MPPARSE)	+= mpparse.o

obj-$(CONFIG_X86_LOCAL_APIC)	+= apic.o nmi.o