From: Paul Jackson With the cpumask rewrite in the previous patch, these various include/asm-*/cpumask*.h headers are no longer used. Signed-off-by: Paul Jackson Signed-off-by: Andrew Morton --- /dev/null | 372 -------------------------------------------------------------- 1 files changed, 372 deletions(-) diff -L include/asm-alpha/cpumask.h -puN include/asm-alpha/cpumask.h~cpumask-6-10-remove-26-no-longer-used-cpumaskh-files /dev/null --- 25/include/asm-alpha/cpumask.h +++ /dev/null Thu Apr 11 07:25:15 2002 @@ -1,6 +0,0 @@ -#ifndef _ASM_ALPHA_CPUMASK_H -#define _ASM_ALPHA_CPUMASK_H - -#include - -#endif /* _ASM_ALPHA_CPUMASK_H */ diff -L include/asm-arm26/cpumask.h -puN include/asm-arm26/cpumask.h~cpumask-6-10-remove-26-no-longer-used-cpumaskh-files /dev/null --- 25/include/asm-arm26/cpumask.h +++ /dev/null Thu Apr 11 07:25:15 2002 @@ -1,6 +0,0 @@ -#ifndef _ASM_ARM26_CPUMASK_H -#define _ASM_ARM26_CPUMASK_H - -#include - -#endif /* _ASM_ARM26_CPUMASK_H */ diff -L include/asm-arm/cpumask.h -puN include/asm-arm/cpumask.h~cpumask-6-10-remove-26-no-longer-used-cpumaskh-files /dev/null --- 25/include/asm-arm/cpumask.h +++ /dev/null Thu Apr 11 07:25:15 2002 @@ -1,6 +0,0 @@ -#ifndef _ASM_ARM_CPUMASK_H -#define _ASM_ARM_CPUMASK_H - -#include - -#endif /* _ASM_ARM_CPUMASK_H */ diff -L include/asm-cris/cpumask.h -puN include/asm-cris/cpumask.h~cpumask-6-10-remove-26-no-longer-used-cpumaskh-files /dev/null --- 25/include/asm-cris/cpumask.h +++ /dev/null Thu Apr 11 07:25:15 2002 @@ -1,6 +0,0 @@ -#ifndef _ASM_CRIS_CPUMASK_H -#define _ASM_CRIS_CPUMASK_H - -#include - -#endif /* _ASM_CRIS_CPUMASK_H */ diff -L include/asm-generic/cpumask_arith.h -puN include/asm-generic/cpumask_arith.h~cpumask-6-10-remove-26-no-longer-used-cpumaskh-files /dev/null --- 25/include/asm-generic/cpumask_arith.h +++ /dev/null Thu Apr 11 07:25:15 2002 @@ -1,49 +0,0 @@ -#ifndef __ASM_GENERIC_CPUMASK_ARITH_H -#define __ASM_GENERIC_CPUMASK_ARITH_H - -/* - * Arithmetic type -based cpu bitmaps. A single unsigned long is used - * to contain the whole cpu bitmap. - */ - -#define cpu_set(cpu, map) set_bit(cpu, &(map)) -#define cpu_clear(cpu, map) clear_bit(cpu, &(map)) -#define cpu_isset(cpu, map) test_bit(cpu, &(map)) -#define cpu_test_and_set(cpu, map) test_and_set_bit(cpu, &(map)) - -#define cpus_and(dst,src1,src2) do { dst = (src1) & (src2); } while (0) -#define cpus_or(dst,src1,src2) do { dst = (src1) | (src2); } while (0) -#define cpus_clear(map) do { map = 0; } while (0) -#define cpus_complement(map) do { map = ~(map); } while (0) -#define cpus_equal(map1, map2) ((map1) == (map2)) -#define cpus_empty(map) ((map) == 0) -#define cpus_addr(map) (&(map)) - -#if BITS_PER_LONG == 32 -#define cpus_weight(map) hweight32(map) -#elif BITS_PER_LONG == 64 -#define cpus_weight(map) hweight64(map) -#endif - -#define cpus_shift_right(dst, src, n) do { dst = (src) >> (n); } while (0) -#define cpus_shift_left(dst, src, n) do { dst = (src) << (n); } while (0) - -#define any_online_cpu(map) \ -({ \ - cpumask_t __tmp__; \ - cpus_and(__tmp__, map, cpu_online_map); \ - __tmp__ ? first_cpu(__tmp__) : NR_CPUS; \ -}) - -#define CPU_MASK_ALL (~((cpumask_t)0) >> (8*sizeof(cpumask_t) - NR_CPUS)) -#define CPU_MASK_NONE ((cpumask_t)0) - -/* only ever use this for things that are _never_ used on large boxen */ -#define cpus_coerce(map) ((unsigned long)(map)) -#define cpus_promote(map) ({ map; }) -#define cpumask_of_cpu(cpu) ({ ((cpumask_t)1) << (cpu); }) - -#define first_cpu(map) find_first_bit(&(map), NR_CPUS) -#define next_cpu(cpu, map) find_next_bit(&(map), NR_CPUS, cpu + 1) - -#endif /* __ASM_GENERIC_CPUMASK_ARITH_H */ diff -L include/asm-generic/cpumask_array.h -puN include/asm-generic/cpumask_array.h~cpumask-6-10-remove-26-no-longer-used-cpumaskh-files /dev/null --- 25/include/asm-generic/cpumask_array.h +++ /dev/null Thu Apr 11 07:25:15 2002 @@ -1,54 +0,0 @@ -#ifndef __ASM_GENERIC_CPUMASK_ARRAY_H -#define __ASM_GENERIC_CPUMASK_ARRAY_H - -/* - * Array-based cpu bitmaps. An array of unsigned longs is used to contain - * the bitmap, and then contained in a structure so it may be passed by - * value. - */ - -#define CPU_ARRAY_SIZE BITS_TO_LONGS(NR_CPUS) - -#define cpu_set(cpu, map) set_bit(cpu, (map).mask) -#define cpu_clear(cpu, map) clear_bit(cpu, (map).mask) -#define cpu_isset(cpu, map) test_bit(cpu, (map).mask) -#define cpu_test_and_set(cpu, map) test_and_set_bit(cpu, (map).mask) - -#define cpus_and(dst,src1,src2) bitmap_and((dst).mask,(src1).mask, (src2).mask, NR_CPUS) -#define cpus_or(dst,src1,src2) bitmap_or((dst).mask, (src1).mask, (src2).mask, NR_CPUS) -#define cpus_clear(map) bitmap_zero((map).mask, NR_CPUS) -#define cpus_complement(map) bitmap_complement((map).mask, (map).mask, NR_CPUS) -#define cpus_equal(map1, map2) bitmap_equal((map1).mask, (map2).mask, NR_CPUS) -#define cpus_empty(map) bitmap_empty(map.mask, NR_CPUS) -#define cpus_addr(map) ((map).mask) -#define cpus_weight(map) bitmap_weight((map).mask, NR_CPUS) -#define cpus_shift_right(d, s, n) bitmap_shift_right((d).mask, (s).mask, n, NR_CPUS) -#define cpus_shift_left(d, s, n) bitmap_shift_left((d).mask, (s).mask, n, NR_CPUS) -#define first_cpu(map) find_first_bit((map).mask, NR_CPUS) -#define next_cpu(cpu, map) find_next_bit((map).mask, NR_CPUS, cpu + 1) - -/* only ever use this for things that are _never_ used on large boxen */ -#define cpus_coerce(map) ((map).mask[0]) -#define cpus_promote(map) ({ cpumask_t __cpu_mask = CPU_MASK_NONE;\ - __cpu_mask.mask[0] = map; \ - __cpu_mask; \ - }) -#define cpumask_of_cpu(cpu) ({ cpumask_t __cpu_mask = CPU_MASK_NONE;\ - cpu_set(cpu, __cpu_mask); \ - __cpu_mask; \ - }) -#define any_online_cpu(map) \ -({ \ - cpumask_t __tmp__; \ - cpus_and(__tmp__, map, cpu_online_map); \ - find_first_bit(__tmp__.mask, NR_CPUS); \ -}) - - -/* - * um, these need to be usable as static initializers - */ -#define CPU_MASK_ALL ((cpumask_t) { {[0 ... CPU_ARRAY_SIZE-1] = ~0UL} }) -#define CPU_MASK_NONE ((cpumask_t) { {[0 ... CPU_ARRAY_SIZE-1] = 0UL} }) - -#endif /* __ASM_GENERIC_CPUMASK_ARRAY_H */ diff -L include/asm-generic/cpumask_const_reference.h -puN include/asm-generic/cpumask_const_reference.h~cpumask-6-10-remove-26-no-longer-used-cpumaskh-files /dev/null --- 25/include/asm-generic/cpumask_const_reference.h +++ /dev/null Thu Apr 11 07:25:15 2002 @@ -1,29 +0,0 @@ -#ifndef __ASM_GENERIC_CPUMASK_CONST_REFERENCE_H -#define __ASM_GENERIC_CPUMASK_CONST_REFERENCE_H - -struct cpumask_ref { - const cpumask_t *val; -}; - -typedef const struct cpumask_ref cpumask_const_t; - -#define mk_cpumask_const(map) ((cpumask_const_t){ &(map) }) -#define cpu_isset_const(cpu, map) cpu_isset(cpu, *(map).val) - -#define cpus_and_const(dst,src1,src2) cpus_and(dst,*(src1).val,*(src2).val) -#define cpus_or_const(dst,src1,src2) cpus_or(dst,*(src1).val,*(src2).val) - -#define cpus_equal_const(map1, map2) cpus_equal(*(map1).val, *(map2).val) - -#define cpus_copy_const(map1, map2) bitmap_copy((map1).mask, (map2).val->mask, NR_CPUS) - -#define cpus_empty_const(map) cpus_empty(*(map).val) -#define cpus_weight_const(map) cpus_weight(*(map).val) -#define first_cpu_const(map) first_cpu(*(map).val) -#define next_cpu_const(cpu, map) next_cpu(cpu, *(map).val) - -/* only ever use this for things that are _never_ used on large boxen */ -#define cpus_coerce_const(map) cpus_coerce(*(map).val) -#define any_online_cpu_const(map) any_online_cpu(*(map).val) - -#endif /* __ASM_GENERIC_CPUMASK_CONST_REFERENCE_H */ diff -L include/asm-generic/cpumask_const_value.h -puN include/asm-generic/cpumask_const_value.h~cpumask-6-10-remove-26-no-longer-used-cpumaskh-files /dev/null --- 25/include/asm-generic/cpumask_const_value.h +++ /dev/null Thu Apr 11 07:25:15 2002 @@ -1,21 +0,0 @@ -#ifndef __ASM_GENERIC_CPUMASK_CONST_VALUE_H -#define __ASM_GENERIC_CPUMASK_CONST_VALUE_H - -typedef const cpumask_t cpumask_const_t; - -#define mk_cpumask_const(map) (map) -#define cpu_isset_const(cpu, map) cpu_isset(cpu, map) -#define cpus_and_const(dst,src1,src2) cpus_and(dst, src1, src2) -#define cpus_or_const(dst,src1,src2) cpus_or(dst, src1, src2) -#define cpus_equal_const(map1, map2) cpus_equal(map1, map2) -#define cpus_empty_const(map) cpus_empty(map) -#define cpus_copy_const(map1, map2) do { map1 = (cpumask_t)map2; } while (0) -#define cpus_weight_const(map) cpus_weight(map) -#define first_cpu_const(map) first_cpu(map) -#define next_cpu_const(cpu, map) next_cpu(cpu, map) - -/* only ever use this for things that are _never_ used on large boxen */ -#define cpus_coerce_const(map) cpus_coerce(map) -#define any_online_cpu_const(map) any_online_cpu(map) - -#endif /* __ASM_GENERIC_CPUMASK_CONST_VALUE_H */ diff -L include/asm-generic/cpumask.h -puN include/asm-generic/cpumask.h~cpumask-6-10-remove-26-no-longer-used-cpumaskh-files /dev/null --- 25/include/asm-generic/cpumask.h +++ /dev/null Thu Apr 11 07:25:15 2002 @@ -1,40 +0,0 @@ -#ifndef __ASM_GENERIC_CPUMASK_H -#define __ASM_GENERIC_CPUMASK_H - -#include -#include -#include -#include -#include - -#if NR_CPUS > BITS_PER_LONG && NR_CPUS != 1 -#define CPU_ARRAY_SIZE BITS_TO_LONGS(NR_CPUS) - -struct cpumask -{ - unsigned long mask[CPU_ARRAY_SIZE]; -}; - -typedef struct cpumask cpumask_t; - -#else -typedef unsigned long cpumask_t; -#endif - -#ifdef CONFIG_SMP -#if NR_CPUS > BITS_PER_LONG -#include -#else -#include -#endif -#else -#include -#endif - -#if NR_CPUS <= 4*BITS_PER_LONG -#include -#else -#include -#endif - -#endif /* __ASM_GENERIC_CPUMASK_H */ diff -L include/asm-generic/cpumask_up.h -puN include/asm-generic/cpumask_up.h~cpumask-6-10-remove-26-no-longer-used-cpumaskh-files /dev/null --- 25/include/asm-generic/cpumask_up.h +++ /dev/null Thu Apr 11 07:25:15 2002 @@ -1,59 +0,0 @@ -#ifndef __ASM_GENERIC_CPUMASK_UP_H -#define __ASM_GENERIC_CPUMASK_UP_H - -#define cpus_coerce(map) (map) - -#define cpu_set(cpu, map) do { (void)(cpu); cpus_coerce(map) = 1UL; } while (0) -#define cpu_clear(cpu, map) do { (void)(cpu); cpus_coerce(map) = 0UL; } while (0) -#define cpu_isset(cpu, map) ((void)(cpu), cpus_coerce(map) != 0UL) -#define cpu_test_and_set(cpu, map) ((void)(cpu), test_and_set_bit(0, &(map))) - -#define cpus_and(dst, src1, src2) \ - do { \ - if (cpus_coerce(src1) && cpus_coerce(src2)) \ - cpus_coerce(dst) = 1UL; \ - else \ - cpus_coerce(dst) = 0UL; \ - } while (0) - -#define cpus_or(dst, src1, src2) \ - do { \ - if (cpus_coerce(src1) || cpus_coerce(src2)) \ - cpus_coerce(dst) = 1UL; \ - else \ - cpus_coerce(dst) = 0UL; \ - } while (0) - -#define cpus_clear(map) do { cpus_coerce(map) = 0UL; } while (0) - -#define cpus_complement(map) \ - do { \ - cpus_coerce(map) = !cpus_coerce(map); \ - } while (0) - -#define cpus_equal(map1, map2) (cpus_coerce(map1) == cpus_coerce(map2)) -#define cpus_empty(map) (cpus_coerce(map) == 0UL) -#define cpus_addr(map) (&(map)) -#define cpus_weight(map) (cpus_coerce(map) ? 1UL : 0UL) -#define cpus_shift_right(d, s, n) do { cpus_coerce(d) = 0UL; } while (0) -#define cpus_shift_left(d, s, n) do { cpus_coerce(d) = 0UL; } while (0) -#define first_cpu(map) (cpus_coerce(map) ? 0 : 1) -#define next_cpu(cpu, map) 1 - -/* only ever use this for things that are _never_ used on large boxen */ -#define cpus_promote(map) \ - ({ \ - cpumask_t __tmp__; \ - cpus_coerce(__tmp__) = map; \ - __tmp__; \ - }) -#define cpumask_of_cpu(cpu) ((void)(cpu), cpus_promote(1)) -#define any_online_cpu(map) (cpus_coerce(map) ? 0 : 1) - -/* - * um, these need to be usable as static initializers - */ -#define CPU_MASK_ALL 1UL -#define CPU_MASK_NONE 0UL - -#endif /* __ASM_GENERIC_CPUMASK_UP_H */ diff -L include/asm-h8300/cpumask.h -puN include/asm-h8300/cpumask.h~cpumask-6-10-remove-26-no-longer-used-cpumaskh-files /dev/null --- 25/include/asm-h8300/cpumask.h +++ /dev/null Thu Apr 11 07:25:15 2002 @@ -1,6 +0,0 @@ -#ifndef _ASM_H8300_CPUMASK_H -#define _ASM_H8300_CPUMASK_H - -#include - -#endif /* _ASM_H8300_CPUMASK_H */ diff -L include/asm-i386/cpumask.h -puN include/asm-i386/cpumask.h~cpumask-6-10-remove-26-no-longer-used-cpumaskh-files /dev/null --- 25/include/asm-i386/cpumask.h +++ /dev/null Thu Apr 11 07:25:15 2002 @@ -1,6 +0,0 @@ -#ifndef _ASM_I386_CPUMASK_H -#define _ASM_I386_CPUMASK_H - -#include - -#endif /* _ASM_I386_CPUMASK_H */ diff -L include/asm-ia64/cpumask.h -puN include/asm-ia64/cpumask.h~cpumask-6-10-remove-26-no-longer-used-cpumaskh-files /dev/null --- 25/include/asm-ia64/cpumask.h +++ /dev/null Thu Apr 11 07:25:15 2002 @@ -1,6 +0,0 @@ -#ifndef _ASM_IA64_CPUMASK_H -#define _ASM_IA64_CPUMASK_H - -#include - -#endif /* _ASM_IA64_CPUMASK_H */ diff -L include/asm-m68k/cpumask.h -puN include/asm-m68k/cpumask.h~cpumask-6-10-remove-26-no-longer-used-cpumaskh-files /dev/null --- 25/include/asm-m68k/cpumask.h +++ /dev/null Thu Apr 11 07:25:15 2002 @@ -1,6 +0,0 @@ -#ifndef _ASM_M68K_CPUMASK_H -#define _ASM_M68K_CPUMASK_H - -#include - -#endif /* _ASM_M68K_CPUMASK_H */ diff -L include/asm-m68knommu/cpumask.h -puN include/asm-m68knommu/cpumask.h~cpumask-6-10-remove-26-no-longer-used-cpumaskh-files /dev/null --- 25/include/asm-m68knommu/cpumask.h +++ /dev/null Thu Apr 11 07:25:15 2002 @@ -1,6 +0,0 @@ -#ifndef _ASM_M68KNOMMU_CPUMASK_H -#define _ASM_M68KNOMMU_CPUMASK_H - -#include - -#endif /* _ASM_M68KNOMMU_CPUMASK_H */ diff -L include/asm-mips/cpumask.h -puN include/asm-mips/cpumask.h~cpumask-6-10-remove-26-no-longer-used-cpumaskh-files /dev/null --- 25/include/asm-mips/cpumask.h +++ /dev/null Thu Apr 11 07:25:15 2002 @@ -1,6 +0,0 @@ -#ifndef _ASM_MIPS_CPUMASK_H -#define _ASM_MIPS_CPUMASK_H - -#include - -#endif /* _ASM_MIPS_CPUMASK_H */ diff -L include/asm-parisc/cpumask.h -puN include/asm-parisc/cpumask.h~cpumask-6-10-remove-26-no-longer-used-cpumaskh-files /dev/null --- 25/include/asm-parisc/cpumask.h +++ /dev/null Thu Apr 11 07:25:15 2002 @@ -1,6 +0,0 @@ -#ifndef _ASM_PARISC_CPUMASK_H -#define _ASM_PARISC_CPUMASK_H - -#include - -#endif /* _ASM_PARISC_CPUMASK_H */ diff -L include/asm-ppc64/cpumask.h -puN include/asm-ppc64/cpumask.h~cpumask-6-10-remove-26-no-longer-used-cpumaskh-files /dev/null --- 25/include/asm-ppc64/cpumask.h +++ /dev/null Thu Apr 11 07:25:15 2002 @@ -1,6 +0,0 @@ -#ifndef _ASM_PPC64_CPUMASK_H -#define _ASM_PPC64_CPUMASK_H - -#include - -#endif /* _ASM_PPC64_CPUMASK_H */ diff -L include/asm-ppc/cpumask.h -puN include/asm-ppc/cpumask.h~cpumask-6-10-remove-26-no-longer-used-cpumaskh-files /dev/null --- 25/include/asm-ppc/cpumask.h +++ /dev/null Thu Apr 11 07:25:15 2002 @@ -1,6 +0,0 @@ -#ifndef _ASM_PPC_CPUMASK_H -#define _ASM_PPC_CPUMASK_H - -#include - -#endif /* _ASM_PPC_CPUMASK_H */ diff -L include/asm-s390/cpumask.h -puN include/asm-s390/cpumask.h~cpumask-6-10-remove-26-no-longer-used-cpumaskh-files /dev/null --- 25/include/asm-s390/cpumask.h +++ /dev/null Thu Apr 11 07:25:15 2002 @@ -1,6 +0,0 @@ -#ifndef _ASM_S390_CPUMASK_H -#define _ASM_S390_CPUMASK_H - -#include - -#endif /* _ASM_S390_CPUMASK_H */ diff -L include/asm-sh/cpumask.h -puN include/asm-sh/cpumask.h~cpumask-6-10-remove-26-no-longer-used-cpumaskh-files /dev/null --- 25/include/asm-sh/cpumask.h +++ /dev/null Thu Apr 11 07:25:15 2002 @@ -1,6 +0,0 @@ -#ifndef _ASM_SH_CPUMASK_H -#define _ASM_SH_CPUMASK_H - -#include - -#endif /* _ASM_SH_CPUMASK_H */ diff -L include/asm-sparc64/cpumask.h -puN include/asm-sparc64/cpumask.h~cpumask-6-10-remove-26-no-longer-used-cpumaskh-files /dev/null --- 25/include/asm-sparc64/cpumask.h +++ /dev/null Thu Apr 11 07:25:15 2002 @@ -1,6 +0,0 @@ -#ifndef _ASM_SPARC64_CPUMASK_H -#define _ASM_SPARC64_CPUMASK_H - -#include - -#endif /* _ASM_SPARC64_CPUMASK_H */ diff -L include/asm-sparc/cpumask.h -puN include/asm-sparc/cpumask.h~cpumask-6-10-remove-26-no-longer-used-cpumaskh-files /dev/null --- 25/include/asm-sparc/cpumask.h +++ /dev/null Thu Apr 11 07:25:15 2002 @@ -1,6 +0,0 @@ -#ifndef _ASM_SPARC_CPUMASK_H -#define _ASM_SPARC_CPUMASK_H - -#include - -#endif /* _ASM_SPARC_CPUMASK_H */ diff -L include/asm-um/cpumask.h -puN include/asm-um/cpumask.h~cpumask-6-10-remove-26-no-longer-used-cpumaskh-files /dev/null --- 25/include/asm-um/cpumask.h +++ /dev/null Thu Apr 11 07:25:15 2002 @@ -1,6 +0,0 @@ -#ifndef _ASM_UM_CPUMASK_H -#define _ASM_UM_CPUMASK_H - -#include - -#endif /* _ASM_UM_CPUMASK_H */ diff -L include/asm-v850/cpumask.h -puN include/asm-v850/cpumask.h~cpumask-6-10-remove-26-no-longer-used-cpumaskh-files /dev/null --- 25/include/asm-v850/cpumask.h +++ /dev/null Thu Apr 11 07:25:15 2002 @@ -1,6 +0,0 @@ -#ifndef _ASM_V850_CPUMASK_H -#define _ASM_V850_CPUMASK_H - -#include - -#endif /* _ASM_V850_CPUMASK_H */ diff -L include/asm-x86_64/cpumask.h -puN include/asm-x86_64/cpumask.h~cpumask-6-10-remove-26-no-longer-used-cpumaskh-files /dev/null --- 25/include/asm-x86_64/cpumask.h +++ /dev/null Thu Apr 11 07:25:15 2002 @@ -1,6 +0,0 @@ -#ifndef _ASM_X86_64_CPUMASK_H -#define _ASM_X86_64_CPUMASK_H - -#include - -#endif /* _ASM_X86_64_CPUMASK_H */ _