]>
Commit | Line | Data |
---|---|---|
2cb7cef9 BS |
1 | From: Thomas Renninger <trenn@suse.de> |
2 | Subject: more cpumask cleanups for previous (x86_sgi_cpu4096..) patches | |
3 | References: Additional cpumask fixups | |
4 | Patch-mainline: 2.6.28 | |
5 | ||
6 | Signed-off-by: Thomas Renninger <trenn@suse.de> | |
7 | ||
8 | --- | |
9 | include/asm/mach-es7000/mach_apic.h | 10 +++++----- | |
10 | include/asm/mach-summit/mach_apic.h | 6 +++--- | |
11 | 2 files changed, 8 insertions(+), 8 deletions(-) | |
12 | ||
13 | Index: linux-2.6.27/include/asm/mach-summit/mach_apic.h | |
14 | =================================================================== | |
15 | --- linux-2.6.27.orig/include/asm-x86/mach-summit/mach_apic.h | |
16 | +++ linux-2.6.27/include/asm-x86/mach-summit/mach_apic.h | |
17 | @@ -145,7 +145,7 @@ static inline unsigned int cpu_mask_to_a | |
18 | int cpu; | |
19 | int apicid; | |
20 | ||
21 | - num_bits_set = cpus_weight(cpumask); | |
22 | + num_bits_set = cpus_weight(*cpumask); | |
23 | /* Return id to all */ | |
24 | if (num_bits_set == NR_CPUS) | |
25 | return (int) 0xFF; | |
26 | @@ -153,10 +153,10 @@ static inline unsigned int cpu_mask_to_a | |
27 | * The cpus in the mask must all be on the apic cluster. If are not | |
28 | * on the same apicid cluster return default value of TARGET_CPUS. | |
29 | */ | |
30 | - cpu = first_cpu(cpumask); | |
31 | + cpu = first_cpu(*cpumask); | |
32 | apicid = cpu_to_logical_apicid(cpu); | |
33 | while (cpus_found < num_bits_set) { | |
34 | - if (cpu_isset(cpu, cpumask)) { | |
35 | + if (cpu_isset(cpu, *cpumask)) { | |
36 | int new_apicid = cpu_to_logical_apicid(cpu); | |
37 | if (apicid_cluster(apicid) != | |
38 | apicid_cluster(new_apicid)){ | |
39 | Index: linux-2.6.27/include/asm/mach-es7000/mach_apic.h | |
40 | =================================================================== | |
41 | --- linux-2.6.27.orig/include/asm-x86/mach-es7000/mach_apic.h | |
42 | +++ linux-2.6.27/include/asm-x86/mach-es7000/mach_apic.h | |
43 | @@ -9,7 +9,7 @@ static inline int apic_id_registered(voi | |
44 | return (1); | |
45 | } | |
46 | ||
47 | -static inline cpumask_t *target_cpus(void) | |
48 | +static inline const cpumask_t *target_cpus(void) | |
49 | { | |
50 | #if defined CONFIG_ES7000_CLUSTERED_APIC | |
51 | return &CPU_MASK_ALL; | |
52 | @@ -81,7 +81,7 @@ static inline void setup_apic_routing(vo | |
53 | int apic = per_cpu(x86_bios_cpu_apicid, smp_processor_id()); | |
54 | printk("Enabling APIC mode: %s. Using %d I/O APICs, target cpus %lx\n", | |
55 | (apic_version[apic] == 0x14) ? | |
56 | - "Physical Cluster" : "Logical Cluster", nr_ioapics, cpus_addr(TARGET_CPUS)[0]); | |
57 | + "Physical Cluster" : "Logical Cluster", nr_ioapics, cpus_addr(*TARGET_CPUS)[0]); | |
58 | } | |
59 | ||
60 | static inline int multi_timer_check(int apic, int irq) | |
61 | @@ -152,7 +152,7 @@ static inline unsigned int cpu_mask_to_a | |
62 | int cpu; | |
63 | int apicid; | |
64 | ||
65 | - num_bits_set = cpus_weight(cpumask); | |
66 | + num_bits_set = cpus_weight(*cpumask); | |
67 | /* Return id to all */ | |
68 | if (num_bits_set == NR_CPUS) | |
69 | #if defined CONFIG_ES7000_CLUSTERED_APIC | |
70 | @@ -164,10 +164,10 @@ static inline unsigned int cpu_mask_to_a | |
71 | * The cpus in the mask must all be on the apic cluster. If are not | |
72 | * on the same apicid cluster return default value of TARGET_CPUS. | |
73 | */ | |
74 | - cpu = first_cpu(cpumask); | |
75 | + cpu = first_cpu(*cpumask); | |
76 | apicid = cpu_to_logical_apicid(cpu); | |
77 | while (cpus_found < num_bits_set) { | |
78 | - if (cpu_isset(cpu, cpumask)) { | |
79 | + if (cpu_isset(cpu, *cpumask)) { | |
80 | int new_apicid = cpu_to_logical_apicid(cpu); | |
81 | if (apicid_cluster(apicid) != | |
82 | apicid_cluster(new_apicid)){ |