Messages in this thread Patch in this message | | | Date | Thu, 22 Apr 2004 00:07:42 -0700 | From | Paul Jackson <> | Subject | [Patch 11 of 17] cpumask v4 - Recode obsolete cpumask macros - arch x86_64 |
| |
mask11-cpumask-x86-64-fixup - Remove/recode obsolete cpumask macros from arch x86_64 Remove by recoding all uses of the obsolete cpumask const, coerce and promote macros.
Diffstat Patch_9_of_23: arch/x86_64/kernel/io_apic.c | 2 +- arch/x86_64/kernel/pci-gart.c | 4 ++-- arch/x86_64/kernel/smp.c | 2 +- include/asm-x86_64/smp.h | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-)
Index: 2.6.5.mask/arch/x86_64/kernel/io_apic.c =================================================================== --- 2.6.5.mask.orig/arch/x86_64/kernel/io_apic.c 2004-04-03 23:37:43.000000000 -0800 +++ 2.6.5.mask/arch/x86_64/kernel/io_apic.c 2004-04-03 23:52:03.000000000 -0800 @@ -1368,7 +1368,7 @@ unsigned long flags; unsigned int dest; - dest = cpu_mask_to_apicid(mk_cpumask_const(mask)); + dest = cpu_mask_to_apicid(mask); /* * Only the first 8 bits are valid. Index: 2.6.5.mask/arch/x86_64/kernel/pci-gart.c =================================================================== --- 2.6.5.mask.orig/arch/x86_64/kernel/pci-gart.c 2004-04-03 23:37:43.000000000 -0800 +++ 2.6.5.mask/arch/x86_64/kernel/pci-gart.c 2004-04-03 23:52:03.000000000 -0800 @@ -149,7 +149,7 @@ { unsigned long flags; int bus = dev ? dev->bus->number : -1; - cpumask_const_t bus_cpumask = pcibus_to_cpumask(bus); + cpumask_t bus_cpumask = pcibus_to_cpumask(bus); int flushed = 0; int i; @@ -159,7 +159,7 @@ u32 w; if (!northbridges[i]) continue; - if (bus >= 0 && !(cpu_isset_const(i, bus_cpumask))) + if (bus >= 0 && !(cpu_isset(i, bus_cpumask))) continue; pci_write_config_dword(northbridges[i], 0x9c, northbridge_flush_word[i] | 1); Index: 2.6.5.mask/arch/x86_64/kernel/smp.c =================================================================== --- 2.6.5.mask.orig/arch/x86_64/kernel/smp.c 2004-04-03 23:37:43.000000000 -0800 +++ 2.6.5.mask/arch/x86_64/kernel/smp.c 2004-04-03 23:52:03.000000000 -0800 @@ -94,7 +94,7 @@ static inline void send_IPI_mask(cpumask_t cpumask, int vector) { - unsigned long mask = cpus_coerce(cpumask); + unsigned long mask = cpus_addr(cpumask)[0]; unsigned long cfg; unsigned long flags; Index: 2.6.5.mask/include/asm-x86_64/smp.h =================================================================== --- 2.6.5.mask.orig/include/asm-x86_64/smp.h 2004-04-03 23:38:16.000000000 -0800 +++ 2.6.5.mask/include/asm-x86_64/smp.h 2004-04-03 23:52:03.000000000 -0800 @@ -95,9 +95,9 @@ #define TARGET_CPUS 1 #ifndef ASSEMBLY -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]; } #endif
-- I won't rest till it's the best ... Programmer, Linux Scalability Paul Jackson <pj@sgi.com> 1.650.933.1373 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |