diff options
| author | Kanoj Sarcar <kanoj@engr.sgi.com> | 2001-02-28 02:10:03 +0000 |
|---|---|---|
| committer | Kanoj Sarcar <kanoj@engr.sgi.com> | 2001-02-28 02:10:03 +0000 |
| commit | 734ecc70e4c08e3a5ed19e08482b53ed97b6d809 (patch) | |
| tree | a4c7297e4ca0f3f65f4372027549d14d809a032c /include | |
| parent | a083cd64c5eca44fc8721a16b43d5ed82fa2d9d3 (diff) | |
Move the multiply-defined cpumask macros from .c files into smp.h for
consistency.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-mips64/smp.h | 24 | ||||
| -rw-r--r-- | include/asm-mips64/sn/types.h | 1 |
2 files changed, 20 insertions, 5 deletions
diff --git a/include/asm-mips64/smp.h b/include/asm-mips64/smp.h index 9b9bf41e3..8ec23cc47 100644 --- a/include/asm-mips64/smp.h +++ b/include/asm-mips64/smp.h @@ -1,16 +1,25 @@ +/* + * This file is subject to the terms and conditions of the GNU General + * Public License. See the file "COPYING" in the main directory of this + * archive for more details. + * + * Copyright (C) 2000 - 2001 by Kanoj Sarcar (kanoj@sgi.com) + * Copyright (C) 2000 - 2001 by Silicon Graphics, Inc. + */ + #ifndef __ASM_SMP_H #define __ASM_SMP_H #include <linux/config.h> +#include <linux/threads.h> #ifdef CONFIG_SMP -#include <linux/threads.h> #include <linux/irq.h> #if 0 struct cpuinfo_mips { /* XXX */ - unsigned long loops_per_jiffy; + unsigned long loops_per_sec; unsigned long last_asn; unsigned long *pgd_cache; unsigned long *pte_cache; @@ -38,8 +47,15 @@ extern int __cpu_number_map[NR_CPUS]; extern int __cpu_logical_map[NR_CPUS]; #define cpu_logical_map(cpu) __cpu_logical_map[cpu] -#endif +#endif /* CONFIG_SMP */ #define NO_PROC_ID (-1) -#endif __ASM_SMP_H +typedef unsigned long cpumask_t; + +#define CPUMASK_CLRALL(p) (p) = 0 +#define CPUMASK_SETB(p, bit) (p) |= 1 << (bit) +#define CPUMASK_CLRB(p, bit) (p) &= ~(1ULL << (bit)) +#define CPUMASK_TSTB(p, bit) ((p) & (1ULL << (bit))) + +#endif /* __ASM_SMP_H */ diff --git a/include/asm-mips64/sn/types.h b/include/asm-mips64/sn/types.h index 40aced527..8652fd35d 100644 --- a/include/asm-mips64/sn/types.h +++ b/include/asm-mips64/sn/types.h @@ -13,7 +13,6 @@ #include <linux/types.h> typedef unsigned long cpuid_t; -typedef unsigned long cpumask_t; typedef unsigned long cnodemask_t; typedef signed short nasid_t; /* node id in numa-as-id space */ typedef signed short cnodeid_t; /* node id in compact-id space */ |