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

Commit 558f6ab9 authored by Rusty Russell's avatar Rusty Russell
Browse files

Merge branch 'cpumask-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 

Conflicts:

	arch/x86/include/asm/topology.h
	drivers/oprofile/buffer_sync.c
(Both cases: changed in Linus' tree, removed in Ingo's).
parents 15f7176e 65fb0d23

arch/powerpc/include/asm/mmzone.h

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#define _ASM_MMZONE_H_

#ifdef __KERNEL__



#include <linux/cpumask.h>



/*

 * generic non-linear memory support:

arch/sparc/include/asm/mmzone.h

+2 −0
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ 


#ifdef CONFIG_NEED_MULTIPLE_NODES



#include <linux/cpumask.h>



extern struct pglist_data *node_data[];



#define NODE_DATA(nid)		(node_data[nid])

arch/x86/include/asm/cpumask.h

+0 −18
Original line number Diff line number Diff line
@@ -3,8 +3,6 @@ 
#ifndef __ASSEMBLY__

#include <linux/cpumask.h>



#ifdef CONFIG_X86_64



extern cpumask_var_t cpu_callin_mask;

extern cpumask_var_t cpu_callout_mask;

extern cpumask_var_t cpu_initialized_mask;
@@ -12,21 +10,5 @@ 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;

extern cpumask_t cpu_callout_map;

extern cpumask_t cpu_initialized;

extern cpumask_t cpu_sibling_setup_map;



#define cpu_callin_mask		((struct cpumask *)&cpu_callin_map)

#define cpu_callout_mask	((struct cpumask *)&cpu_callout_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__ */

#endif /* _ASM_X86_CPUMASK_H */

arch/x86/include/asm/pci.h

+0 −5
Original line number Diff line number Diff line
@@ -109,11 +109,6 @@ static inline int __pcibus_to_node(const struct pci_bus *bus) 
	return sd->node;

}



static inline cpumask_t __pcibus_to_cpumask(struct pci_bus *bus)

{

	return node_to_cpumask(__pcibus_to_node(bus));

}



static inline const struct cpumask *

cpumask_of_pcibus(const struct pci_bus *bus)

{

arch/x86/include/asm/processor.h

+2 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ struct cpuinfo_x86 { 
	unsigned long		loops_per_jiffy;

#ifdef CONFIG_SMP

	/* cpus sharing the last level cache: */

	cpumask_t		llc_shared_map;

	cpumask_var_t		llc_shared_map;

#endif

	/* cpuid returned max cores value: */

	u16			 x86_max_cores;
@@ -736,6 +736,7 @@ static inline void __sti_mwait(unsigned long eax, unsigned long ecx) 
extern void mwait_idle_with_hints(unsigned long eax, unsigned long ecx);



extern void select_idle_routine(const struct cpuinfo_x86 *c);

extern void init_c1e_mask(void);



extern unsigned long		boot_option_idle_override;

extern unsigned long		idle_halt;