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

Commit c847a9c7 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'master' of... 

Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/travis/linux-2.6-cpus4096-for-ingo into cpus4096
parents 5cd73762 f2a08271

arch/x86/include/asm/topology.h

+14 −3
Original line number Diff line number Diff line
@@ -192,9 +192,20 @@ extern int __node_distance(int, int); 


#else /* !CONFIG_NUMA */



#define numa_node_id()		0

#define	cpu_to_node(cpu)	0

#define	early_cpu_to_node(cpu)	0

static inline int numa_node_id(void)

{

	return 0;

}



static inline int cpu_to_node(int cpu)

{

	return 0;

}



static inline int early_cpu_to_node(int cpu)

{

	return 0;

}



static inline const cpumask_t *cpumask_of_node(int node)

{