Commit 7d3b56ba authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'cpus4096-for-linus-3' of... 

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

* 'cpus4096-for-linus-3' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (77 commits)
  x86: setup_per_cpu_areas() cleanup
  cpumask: fix compile error when CONFIG_NR_CPUS is not defined
  cpumask: use alloc_cpumask_var_node where appropriate
  cpumask: convert shared_cpu_map in acpi_processor* structs to cpumask_var_t
  x86: use cpumask_var_t in acpi/boot.c
  x86: cleanup some remaining usages of NR_CPUS where s/b nr_cpu_ids
  sched: put back some stack hog changes that were undone in kernel/sched.c
  x86: enable cpus display of kernel_max and offlined cpus
  ia64: cpumask fix for is_affinity_mask_valid()
  cpumask: convert RCU implementations, fix
  xtensa: define __fls
  mn10300: define __fls
  m32r: define __fls
  h8300: define __fls
  frv: define __fls
  cris: define __fls
  cpumask: CONFIG_DISABLE_OBSOLETE_CPUMASK_FUNCTIONS
  cpumask: zero extra bits in alloc_cpumask_var_node
  cpumask: replace for_each_cpu_mask_nr with for_each_cpu in kernel/time/
  cpumask: convert mm/
  ...
parents 269b0123 ab14398a

Documentation/cputopology.txt

+48 −0
Original line number Diff line number Diff line
@@ -31,3 +31,51 @@ not defined by include/asm-XXX/topology.h: 
2) core_id: 0

3) thread_siblings: just the given CPU

4) core_siblings: just the given CPU



Additionally, cpu topology information is provided under

/sys/devices/system/cpu and includes these files.  The internal

source for the output is in brackets ("[]").



    kernel_max: the maximum cpu index allowed by the kernel configuration.

		[NR_CPUS-1]



    offline:	cpus that are not online because they have been

		HOTPLUGGED off (see cpu-hotplug.txt) or exceed the limit

		of cpus allowed by the kernel configuration (kernel_max

		above). [~cpu_online_mask + cpus >= NR_CPUS]



    online:	cpus that are online and being scheduled [cpu_online_mask]



    possible:	cpus that have been allocated resources and can be

		brought online if they are present. [cpu_possible_mask]



    present:	cpus that have been identified as being present in the

		system. [cpu_present_mask]



The format for the above output is compatible with cpulist_parse()

[see <linux/cpumask.h>].  Some examples follow.



In this example, there are 64 cpus in the system but cpus 32-63 exceed

the kernel max which is limited to 0..31 by the NR_CPUS config option

being 32.  Note also that cpus 2 and 4-31 are not online but could be

brought online as they are both present and possible.



     kernel_max: 31

        offline: 2,4-31,32-63

         online: 0-1,3

       possible: 0-31

        present: 0-31



In this example, the NR_CPUS config option is 128, but the kernel was

started with possible_cpus=144.  There are 4 cpus in the system and cpu2

was manually taken offline (and is the only cpu that can be brought

online.)



     kernel_max: 127

        offline: 2,4-127,128-143

         online: 0-1,3

       possible: 0-127

        present: 0-3



See cpu-hotplug.txt for the possible_cpus=NUM kernel start parameter

as well as more information on the various cpumask's.

arch/alpha/include/asm/topology.h

+17 −0
Original line number Diff line number Diff line
@@ -39,7 +39,24 @@ static inline cpumask_t node_to_cpumask(int node) 
	return node_cpu_mask;

}



extern struct cpumask node_to_cpumask_map[];

/* FIXME: This is dumb, recalculating every time.  But simple. */

static const struct cpumask *cpumask_of_node(int node)

{

	int cpu;



	cpumask_clear(&node_to_cpumask_map[node]);



	for_each_online_cpu(cpu) {

		if (cpu_to_node(cpu) == node)

			cpumask_set_cpu(cpu, node_to_cpumask_map[node]);

	}



	return &node_to_cpumask_map[node];

}



#define pcibus_to_cpumask(bus)	(cpu_online_map)

#define cpumask_of_pcibus(bus)	(cpu_online_mask)



#endif /* !CONFIG_NUMA */

# include <asm-generic/topology.h>

arch/alpha/kernel/irq.c

+2 −1
Original line number Diff line number Diff line
@@ -50,7 +50,8 @@ int irq_select_affinity(unsigned int irq) 
	if (!irq_desc[irq].chip->set_affinity || irq_user_affinity[irq])

		return 1;



	while (!cpu_possible(cpu) || !cpu_isset(cpu, irq_default_affinity))

	while (!cpu_possible(cpu) ||

	       !cpumask_test_cpu(cpu, irq_default_affinity))

		cpu = (cpu < (NR_CPUS-1) ? cpu + 1 : 0);

	last_cpu = cpu;

arch/alpha/kernel/setup.c

+5 −0
Original line number Diff line number Diff line
@@ -79,6 +79,11 @@ int alpha_l3_cacheshape; 
unsigned long alpha_verbose_mcheck = CONFIG_VERBOSE_MCHECK_ON;

#endif



#ifdef CONFIG_NUMA

struct cpumask node_to_cpumask_map[MAX_NUMNODES] __read_mostly;

EXPORT_SYMBOL(node_to_cpumask_map);

#endif



/* Which processor we booted from.  */

int boot_cpuid;

arch/avr32/include/asm/bitops.h

+5 −0
Original line number Diff line number Diff line
@@ -263,6 +263,11 @@ static inline int fls(unsigned long word) 
	return 32 - result;

}



static inline int __fls(unsigned long word)

{

	return fls(word) - 1;

}



unsigned long find_first_zero_bit(const unsigned long *addr,

				  unsigned long size);

unsigned long find_next_zero_bit(const unsigned long *addr,

CRA Git | Maintained and supported by SUSTech CRA and CCSE