From: Paul Jackson <pj@sgi.com>
Remove by recoding i386 uses of the obsolete cpumask const, coerce and promote
macros.
Signed-off-by: Paul Jackson <pj@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/arch/i386/kernel/io_apic.c | 2 -
25-akpm/arch/i386/kernel/smp.c | 2 -
25-akpm/arch/i386/mach-voyager/voyager_smp.c | 30 +++++++++++-----------
25-akpm/include/asm-i386/genapic.h | 2 -
25-akpm/include/asm-i386/mach-bigsmp/mach_apic.h | 10 +++----
25-akpm/include/asm-i386/mach-default/mach_apic.h | 10 +++----
25-akpm/include/asm-i386/mach-es7000/mach_apic.h | 10 +++----
25-akpm/include/asm-i386/mach-numaq/mach_apic.h | 2 -
25-akpm/include/asm-i386/mach-summit/mach_apic.h | 8 ++---
25-akpm/include/asm-i386/mach-visws/mach_apic.h | 4 +-
10 files changed, 40 insertions(+), 40 deletions(-)
diff -puN arch/i386/kernel/io_apic.c~cpumask-7-10-remove-obsolete-cpumask-macro-uses-i386-arch arch/i386/kernel/io_apic.c
--- 25/arch/i386/kernel/io_apic.c~cpumask-7-10-remove-obsolete-cpumask-macro-uses-i386-arch Thu Jun 3 17:11:44 2004
+++ 25-akpm/arch/i386/kernel/io_apic.c Thu Jun 3 17:11:45 2004
@@ -224,7 +224,7 @@ static void set_ioapic_affinity_irq(unsi
struct irq_pin_list *entry = irq_2_pin + irq;
unsigned int apicid_value;
- apicid_value = cpu_mask_to_apicid(mk_cpumask_const(cpumask));
+ apicid_value = cpu_mask_to_apicid(cpumask);
/* Prepare to do the io_apic_write */
apicid_value = apicid_value << 24;
spin_lock_irqsave(&ioapic_lock, flags);
diff -puN arch/i386/kernel/smp.c~cpumask-7-10-remove-obsolete-cpumask-macro-uses-i386-arch arch/i386/kernel/smp.c
--- 25/arch/i386/kernel/smp.c~cpumask-7-10-remove-obsolete-cpumask-macro-uses-i386-arch Thu Jun 3 17:11:44 2004
+++ 25-akpm/arch/i386/kernel/smp.c Thu Jun 3 17:11:45 2004
@@ -159,7 +159,7 @@ void fastcall send_IPI_self(int vector)
*/
inline void send_IPI_mask_bitmask(cpumask_t cpumask, int vector)
{
- unsigned long mask = cpus_coerce(cpumask);
+ unsigned long mask = cpus_addr(cpumask)[0];
unsigned long cfg;
unsigned long flags;
diff -puN arch/i386/mach-voyager/voyager_smp.c~cpumask-7-10-remove-obsolete-cpumask-macro-uses-i386-arch arch/i386/mach-voyager/voyager_smp.c
--- 25/arch/i386/mach-voyager/voyager_smp.c~cpumask-7-10-remove-obsolete-cpumask-macro-uses-i386-arch Thu Jun 3 17:11:44 2004
+++ 25-akpm/arch/i386/mach-voyager/voyager_smp.c Thu Jun 3 17:11:45 2004
@@ -153,7 +153,7 @@ static inline void
send_CPI_allbutself(__u8 cpi)
{
__u8 cpu = smp_processor_id();
- __u32 mask = cpus_coerce(cpu_online_map) & ~(1 << cpu);
+ __u32 mask = cpus_addr(cpu_online_map)[0] & ~(1 << cpu);
send_CPI(mask, cpi);
}
@@ -402,11 +402,11 @@ find_smp_config(void)
/* set up everything for just this CPU, we can alter
* this as we start the other CPUs later */
/* now get the CPU disposition from the extended CMOS */
- phys_cpu_present_map = cpus_promote(voyager_extended_cmos_read(VOYAGER_PROCESSOR_PRESENT_MASK));
- cpus_coerce(phys_cpu_present_map) |= voyager_extended_cmos_read(VOYAGER_PROCESSOR_PRESENT_MASK + 1) << 8;
- cpus_coerce(phys_cpu_present_map) |= voyager_extended_cmos_read(VOYAGER_PROCESSOR_PRESENT_MASK + 2) << 16;
- cpus_coerce(phys_cpu_present_map) |= voyager_extended_cmos_read(VOYAGER_PROCESSOR_PRESENT_MASK + 3) << 24;
- printk("VOYAGER SMP: phys_cpu_present_map = 0x%lx\n", cpus_coerce(phys_cpu_present_map));
+ cpus_addr(phys_cpu_present_map)[0] = voyager_extended_cmos_read(VOYAGER_PROCESSOR_PRESENT_MASK);
+ cpus_addr(phys_cpu_present_map)[0] |= voyager_extended_cmos_read(VOYAGER_PROCESSOR_PRESENT_MASK + 1) << 8;
+ cpus_addr(phys_cpu_present_map)[0] |= voyager_extended_cmos_read(VOYAGER_PROCESSOR_PRESENT_MASK + 2) << 16;
+ cpus_addr(phys_cpu_present_map)[0] |= voyager_extended_cmos_read(VOYAGER_PROCESSOR_PRESENT_MASK + 3) << 24;
+ printk("VOYAGER SMP: phys_cpu_present_map = 0x%lx\n", cpus_addr(phys_cpu_present_map)[0]);
/* Here we set up the VIC to enable SMP */
/* enable the CPIs by writing the base vector to their register */
outb(VIC_DEFAULT_CPI_BASE, VIC_CPI_BASE_REGISTER);
@@ -706,12 +706,12 @@ smp_boot_cpus(void)
/* now that the cat has probed the Voyager System Bus, sanity
* check the cpu map */
if( ((voyager_quad_processors | voyager_extended_vic_processors)
- & cpus_coerce(phys_cpu_present_map)) != cpus_coerce(phys_cpu_present_map)) {
+ & cpus_addr(phys_cpu_present_map)[0]) != cpus_addr(phys_cpu_present_map)[0]) {
/* should panic */
printk("\n\n***WARNING*** Sanity check of CPU present map FAILED\n");
}
} else if(voyager_level == 4)
- voyager_extended_vic_processors = cpus_coerce(phys_cpu_present_map);
+ voyager_extended_vic_processors = cpus_addr(phys_cpu_present_map)[0];
/* this sets up the idle task to run on the current cpu */
voyager_extended_cpus = 1;
@@ -909,7 +909,7 @@ flush_tlb_others (unsigned long cpumask,
if (!cpumask)
BUG();
- if ((cpumask & cpus_coerce(cpu_online_map)) != cpumask)
+ if ((cpumask & cpus_addr(cpu_online_map)[0]) != cpumask)
BUG();
if (cpumask & (1 << smp_processor_id()))
BUG();
@@ -952,7 +952,7 @@ flush_tlb_current_task(void)
preempt_disable();
- cpu_mask = cpus_coerce(mm->cpu_vm_mask) & ~(1 << smp_processor_id());
+ cpu_mask = cpus_addr(mm->cpu_vm_mask)[0] & ~(1 << smp_processor_id());
local_flush_tlb();
if (cpu_mask)
flush_tlb_others(cpu_mask, mm, FLUSH_ALL);
@@ -968,7 +968,7 @@ flush_tlb_mm (struct mm_struct * mm)
preempt_disable();
- cpu_mask = cpus_coerce(mm->cpu_vm_mask) & ~(1 << smp_processor_id());
+ cpu_mask = cpus_addr(mm->cpu_vm_mask)[0] & ~(1 << smp_processor_id());
if (current->active_mm == mm) {
if (current->mm)
@@ -989,7 +989,7 @@ void flush_tlb_page(struct vm_area_struc
preempt_disable();
- cpu_mask = cpus_coerce(mm->cpu_vm_mask) & ~(1 << smp_processor_id());
+ cpu_mask = cpus_addr(mm->cpu_vm_mask)[0] & ~(1 << smp_processor_id());
if (current->active_mm == mm) {
if(current->mm)
__flush_tlb_one(va);
@@ -1098,7 +1098,7 @@ smp_call_function (void (*func) (void *i
int wait)
{
struct call_data_struct data;
- __u32 mask = cpus_coerce(cpu_online_map);
+ __u32 mask = cpus_addr(cpu_online_map)[0];
mask &= ~(1<<smp_processor_id());
@@ -1789,9 +1789,9 @@ set_vic_irq_affinity(unsigned int irq, c
unsigned long irq_mask = 1 << irq;
int cpu;
- real_mask = cpus_coerce(mask) & voyager_extended_vic_processors;
+ real_mask = cpus_addr(mask)[0] & voyager_extended_vic_processors;
- if(cpus_coerce(mask) == 0)
+ if(cpus_addr(mask)[0] == 0)
/* can't have no cpu's to accept the interrupt -- extremely
* bad things will happen */
return;
diff -puN include/asm-i386/genapic.h~cpumask-7-10-remove-obsolete-cpumask-macro-uses-i386-arch include/asm-i386/genapic.h
--- 25/include/asm-i386/genapic.h~cpumask-7-10-remove-obsolete-cpumask-macro-uses-i386-arch Thu Jun 3 17:11:44 2004
+++ 25-akpm/include/asm-i386/genapic.h Thu Jun 3 17:11:45 2004
@@ -63,7 +63,7 @@ struct genapic {
unsigned (*get_apic_id)(unsigned long x);
unsigned long apic_id_mask;
- unsigned int (*cpu_mask_to_apicid)(cpumask_const_t cpumask);
+ unsigned int (*cpu_mask_to_apicid)(cpumask_t cpumask);
/* ipi */
void (*send_IPI_mask)(cpumask_t mask, int vector);
diff -puN include/asm-i386/mach-bigsmp/mach_apic.h~cpumask-7-10-remove-obsolete-cpumask-macro-uses-i386-arch include/asm-i386/mach-bigsmp/mach_apic.h
--- 25/include/asm-i386/mach-bigsmp/mach_apic.h~cpumask-7-10-remove-obsolete-cpumask-macro-uses-i386-arch Thu Jun 3 17:11:44 2004
+++ 25-akpm/include/asm-i386/mach-bigsmp/mach_apic.h Thu Jun 3 17:11:45 2004
@@ -28,11 +28,11 @@ static inline cpumask_t target_cpus(void
static unsigned long cpu = NR_CPUS;
do {
if (cpu >= NR_CPUS)
- cpu = first_cpu_const(cpu_online_map);
+ cpu = first_cpu(cpu_online_map);
else
- cpu = next_cpu_const(cpu, cpu_online_map);
+ cpu = next_cpu(cpu, cpu_online_map);
} while (cpu >= NR_CPUS);
- return mk_cpumask_const(cpumask_of_cpu(cpu));
+ return cpumask_of_cpu(cpu);
}
#define TARGET_CPUS (target_cpus())
@@ -150,12 +150,12 @@ static inline int check_phys_apicid_pres
}
/* As we are using single CPU as destination, pick only one CPU here */
-static inline unsigned int cpu_mask_to_apicid(cpumask_const_t cpumask)
+static inline unsigned int cpu_mask_to_apicid(cpumask_t cpumask)
{
int cpu;
int apicid;
- cpu = first_cpu_const(cpumask);
+ cpu = first_cpu(cpumask);
apicid = cpu_to_logical_apicid(cpu);
return apicid;
}
diff -puN include/asm-i386/mach-default/mach_apic.h~cpumask-7-10-remove-obsolete-cpumask-macro-uses-i386-arch include/asm-i386/mach-default/mach_apic.h
--- 25/include/asm-i386/mach-default/mach_apic.h~cpumask-7-10-remove-obsolete-cpumask-macro-uses-i386-arch Thu Jun 3 17:11:45 2004
+++ 25-akpm/include/asm-i386/mach-default/mach_apic.h Thu Jun 3 17:11:45 2004
@@ -5,12 +5,12 @@
#define APIC_DFR_VALUE (APIC_DFR_FLAT)
-static inline cpumask_const_t target_cpus(void)
+static inline cpumask_t target_cpus(void)
{
#ifdef CONFIG_SMP
- return mk_cpumask_const(cpu_online_map);
+ return cpu_online_map;
#else
- return mk_cpumask_const(cpumask_of_cpu(0));
+ return cpumask_of_cpu(0);
#endif
}
#define TARGET_CPUS (target_cpus())
@@ -118,9 +118,9 @@ static inline int apic_id_registered(voi
return physid_isset(GET_APIC_ID(apic_read(APIC_ID)), phys_cpu_present_map);
}
-static inline unsigned int cpu_mask_to_apicid(cpumask_const_t cpumask)
+static inline unsigned int cpu_mask_to_apicid(cpumask_t cpumask)
{
- return cpus_coerce_const(cpumask);
+ return cpus_addr(cpumask)[0];
}
static inline void enable_apic_mode(void)
diff -puN include/asm-i386/mach-es7000/mach_apic.h~cpumask-7-10-remove-obsolete-cpumask-macro-uses-i386-arch include/asm-i386/mach-es7000/mach_apic.h
--- 25/include/asm-i386/mach-es7000/mach_apic.h~cpumask-7-10-remove-obsolete-cpumask-macro-uses-i386-arch Thu Jun 3 17:11:45 2004
+++ 25-akpm/include/asm-i386/mach-es7000/mach_apic.h Thu Jun 3 17:11:45 2004
@@ -89,7 +89,7 @@ static inline void clustered_apic_check(
int apic = bios_cpu_apicid[smp_processor_id()];
printk("Enabling APIC mode: %s. Using %d I/O APICs, target cpus %lx\n",
(apic_version[apic] == 0x14) ?
- "Physical Cluster" : "Logical Cluster", nr_ioapics, cpus_coerce(TARGET_CPUS));
+ "Physical Cluster" : "Logical Cluster", nr_ioapics, cpus_addr(TARGET_CPUS)[0]);
}
static inline int multi_timer_check(int apic, int irq)
@@ -159,14 +159,14 @@ static inline int check_phys_apicid_pres
return (1);
}
-static inline unsigned int cpu_mask_to_apicid(cpumask_const_t cpumask)
+static inline unsigned int cpu_mask_to_apicid(cpumask_t cpumask)
{
int num_bits_set;
int cpus_found = 0;
int cpu;
int apicid;
- num_bits_set = cpus_weight_const(cpumask);
+ num_bits_set = cpus_weight(cpumask);
/* Return id to all */
if (num_bits_set == NR_CPUS)
#if defined CONFIG_ES7000_CLUSTERED_APIC
@@ -178,10 +178,10 @@ static inline unsigned int cpu_mask_to_a
* The cpus in the mask must all be on the apic cluster. If are not
* on the same apicid cluster return default value of TARGET_CPUS.
*/
- cpu = first_cpu_const(cpumask);
+ cpu = first_cpu(cpumask);
apicid = cpu_to_logical_apicid(cpu);
while (cpus_found < num_bits_set) {
- if (cpu_isset_const(cpu, cpumask)) {
+ if (cpu_isset(cpu, cpumask)) {
int new_apicid = cpu_to_logical_apicid(cpu);
if (apicid_cluster(apicid) !=
apicid_cluster(new_apicid)){
diff -puN include/asm-i386/mach-numaq/mach_apic.h~cpumask-7-10-remove-obsolete-cpumask-macro-uses-i386-arch include/asm-i386/mach-numaq/mach_apic.h
--- 25/include/asm-i386/mach-numaq/mach_apic.h~cpumask-7-10-remove-obsolete-cpumask-macro-uses-i386-arch Thu Jun 3 17:11:45 2004
+++ 25-akpm/include/asm-i386/mach-numaq/mach_apic.h Thu Jun 3 17:11:45 2004
@@ -136,7 +136,7 @@ static inline void enable_apic_mode(void
* We use physical apicids here, not logical, so just return the default
* physical broadcast to stop people from breaking us
*/
-static inline unsigned int cpu_mask_to_apicid(cpumask_const_t cpumask)
+static inline unsigned int cpu_mask_to_apicid(cpumask_t cpumask)
{
return (int) 0xF;
}
diff -puN include/asm-i386/mach-summit/mach_apic.h~cpumask-7-10-remove-obsolete-cpumask-macro-uses-i386-arch include/asm-i386/mach-summit/mach_apic.h
--- 25/include/asm-i386/mach-summit/mach_apic.h~cpumask-7-10-remove-obsolete-cpumask-macro-uses-i386-arch Thu Jun 3 17:11:45 2004
+++ 25-akpm/include/asm-i386/mach-summit/mach_apic.h Thu Jun 3 17:11:45 2004
@@ -140,14 +140,14 @@ static inline void enable_apic_mode(void
{
}
-static inline unsigned int cpu_mask_to_apicid(cpumask_const_t cpumask)
+static inline unsigned int cpu_mask_to_apicid(cpumask_t cpumask)
{
int num_bits_set;
int cpus_found = 0;
int cpu;
int apicid;
- num_bits_set = cpus_weight_const(cpumask);
+ num_bits_set = cpus_weight(cpumask);
/* Return id to all */
if (num_bits_set == NR_CPUS)
return (int) 0xFF;
@@ -155,10 +155,10 @@ static inline unsigned int cpu_mask_to_a
* The cpus in the mask must all be on the apic cluster. If are not
* on the same apicid cluster return default value of TARGET_CPUS.
*/
- cpu = first_cpu_const(cpumask);
+ cpu = first_cpu(cpumask);
apicid = cpu_to_logical_apicid(cpu);
while (cpus_found < num_bits_set) {
- if (cpu_isset_const(cpu, cpumask)) {
+ if (cpu_isset(cpu, cpumask)) {
int new_apicid = cpu_to_logical_apicid(cpu);
if (apicid_cluster(apicid) !=
apicid_cluster(new_apicid)){
diff -puN include/asm-i386/mach-visws/mach_apic.h~cpumask-7-10-remove-obsolete-cpumask-macro-uses-i386-arch include/asm-i386/mach-visws/mach_apic.h
--- 25/include/asm-i386/mach-visws/mach_apic.h~cpumask-7-10-remove-obsolete-cpumask-macro-uses-i386-arch Thu Jun 3 17:11:45 2004
+++ 25-akpm/include/asm-i386/mach-visws/mach_apic.h Thu Jun 3 17:11:45 2004
@@ -84,9 +84,9 @@ static inline int check_phys_apicid_pres
return physid_isset(boot_cpu_physical_apicid, phys_cpu_present_map);
}
-static inline unsigned int cpu_mask_to_apicid(cpumask_const_t cpumask)
+static inline unsigned int cpu_mask_to_apicid(cpumask_t cpumask)
{
- return cpus_coerce_const(cpumask);
+ return cpus_addr(cpumask)[0];
}
static inline u32 phys_pkg_id(u32 cpuid_apic, int index_msb)
_