Commit 4e9b1c18 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

* 'cpus4096-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  [IA64] fix typo in cpumask_of_pcibus()
  x86: fix x86_32 builds for summit and es7000 arch's
  cpumask: use work_on_cpu in acpi-cpufreq.c for read_measured_perf_ctrs
  cpumask: use work_on_cpu in acpi-cpufreq.c for drv_read and drv_write
  cpumask: use cpumask_var_t in acpi-cpufreq.c
  cpumask: use work_on_cpu in acpi/cstate.c
  cpumask: convert struct cpufreq_policy to cpumask_var_t
  cpumask: replace CPUMASK_ALLOC etc with cpumask_var_t
  x86: cleanup remaining cpumask_t ops in smpboot code
  cpumask: update pci_bus_show_cpuaffinity to use new cpumask API
  cpumask: update local_cpus_show to use new cpumask API
  ia64: cpumask fix for is_affinity_mask_valid()
parents 0176260f 36c401a4

arch/ia64/include/asm/irq.h

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ irq_canonicalize (int irq) 
}



extern void set_irq_affinity_info (unsigned int irq, int dest, int redir);

bool is_affinity_mask_valid(cpumask_var_t cpumask);

bool is_affinity_mask_valid(const struct cpumask *cpumask);



#define is_affinity_mask_valid is_affinity_mask_valid

arch/ia64/include/asm/topology.h

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ extern void arch_fix_phys_package_id(int num, u32 slot); 


#define cpumask_of_pcibus(bus)	(pcibus_to_node(bus) == -1 ?		\

				 cpu_all_mask :				\

				 cpumask_from_node(pcibus_to_node(bus)))

				 cpumask_of_node(pcibus_to_node(bus)))



#include <asm-generic/topology.h>

arch/ia64/kernel/irq.c

+6 −9
Original line number Diff line number Diff line
@@ -102,17 +102,14 @@ static char irq_redir [NR_IRQS]; // = { [0 ... NR_IRQS-1] = 1 }; 


void set_irq_affinity_info (unsigned int irq, int hwid, int redir)

{

	cpumask_t mask = CPU_MASK_NONE;



	cpu_set(cpu_logical_id(hwid), mask);



	if (irq < NR_IRQS) {

		irq_desc[irq].affinity = mask;

		cpumask_copy(&irq_desc[irq].affinity,

			     cpumask_of(cpu_logical_id(hwid)));

		irq_redir[irq] = (char) (redir & 0xff);

	}

}



bool is_affinity_mask_valid(cpumask_var_t cpumask)

bool is_affinity_mask_valid(const struct cpumask *cpumask)

{

	if (ia64_platform_is("sn2")) {

		/* Only allow one CPU to be specified in the smp_affinity mask */
@@ -128,7 +125,7 @@ bool is_affinity_mask_valid(cpumask_var_t cpumask) 
unsigned int vectors_in_migration[NR_IRQS];



/*

 * Since cpu_online_map is already updated, we just need to check for

 * Since cpu_online_mask is already updated, we just need to check for

 * affinity that has zeros

 */

static void migrate_irqs(void)
@@ -158,7 +155,7 @@ static void migrate_irqs(void) 
			 */

			vectors_in_migration[irq] = irq;



			new_cpu = any_online_cpu(cpu_online_map);

			new_cpu = cpumask_any(cpu_online_mask);



			/*

			 * Al three are essential, currently WARN_ON.. maybe panic?
@@ -191,7 +188,7 @@ void fixup_irqs(void) 
	 * Find a new timesync master

	 */

	if (smp_processor_id() == time_keeper_id) {

		time_keeper_id = first_cpu(cpu_online_map);

		time_keeper_id = cpumask_first(cpu_online_mask);

		printk ("CPU %d is now promoted to time-keeper master\n", time_keeper_id);

	}

arch/x86/include/asm/es7000/apic.h

+2 −0
Original line number Diff line number Diff line 
#ifndef __ASM_ES7000_APIC_H

#define __ASM_ES7000_APIC_H



#include <linux/gfp.h>



#define xapic_phys_to_log_apicid(cpu) per_cpu(x86_bios_cpu_apicid, cpu)

#define esr_disable (1)

arch/x86/include/asm/smp.h

+29 −3
Original line number Diff line number Diff line
@@ -18,9 +18,26 @@ 
#include <asm/pda.h>

#include <asm/thread_info.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;

extern cpumask_var_t cpu_sibling_setup_mask;



#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_callin_map;

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)



#endif /* CONFIG_X86_32 */



extern void (*mtrr_hook)(void);

extern void zap_low_mappings(void);
@@ -29,7 +46,6 @@ extern int __cpuinit get_local_pda(int cpu); 


extern int smp_num_siblings;

extern unsigned int num_processors;

extern cpumask_t cpu_initialized;



DECLARE_PER_CPU(cpumask_t, cpu_sibling_map);

DECLARE_PER_CPU(cpumask_t, cpu_core_map);
@@ -38,6 +54,16 @@ DECLARE_PER_CPU(u16, cpu_llc_id); 
DECLARE_PER_CPU(int, cpu_number);

#endif



static inline struct cpumask *cpu_sibling_mask(int cpu)

{

	return &per_cpu(cpu_sibling_map, cpu);

}



static inline struct cpumask *cpu_core_mask(int cpu)

{

	return &per_cpu(cpu_core_map, cpu);

}



DECLARE_EARLY_PER_CPU(u16, x86_cpu_to_apicid);

DECLARE_EARLY_PER_CPU(u16, x86_bios_cpu_apicid);
@@ -149,7 +175,7 @@ void smp_store_cpu_info(int id); 
/* We don't mark CPUs online until __cpu_up(), so we need another measure */

static inline int num_booting_cpus(void)

{

	return cpus_weight(cpu_callout_map);

	return cpumask_weight(cpu_callout_mask);

}

#else

static inline void prefill_possible_map(void)

CRA Git | Maintained and supported by SUSTech CRA and CCSE