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 /arch/mips64 | |
| parent | a083cd64c5eca44fc8721a16b43d5ed82fa2d9d3 (diff) | |
Move the multiply-defined cpumask macros from .c files into smp.h for
consistency.
Diffstat (limited to 'arch/mips64')
| -rw-r--r-- | arch/mips64/sgi-ip27/ip27-init.c | 17 | ||||
| -rw-r--r-- | arch/mips64/sgi-ip27/ip27-klnuma.c | 8 |
2 files changed, 15 insertions, 10 deletions
diff --git a/arch/mips64/sgi-ip27/ip27-init.c b/arch/mips64/sgi-ip27/ip27-init.c index 0aae67a69..28bb7243c 100644 --- a/arch/mips64/sgi-ip27/ip27-init.c +++ b/arch/mips64/sgi-ip27/ip27-init.c @@ -1,3 +1,12 @@ +/* + * 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. + */ + #include <linux/config.h> #include <linux/kernel.h> #include <linux/init.h> @@ -26,11 +35,9 @@ #define CPU_NONE (cpuid_t)-1 -#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))) - +/* + * The following should work till 64 nodes, ie 128p SN0s. + */ #define CNODEMASK_CLRALL(p) (p) = 0 #define CNODEMASK_TSTB(p, bit) ((p) & (1ULL << (bit))) #define CNODEMASK_SETB(p, bit) ((p) |= 1ULL << (bit)) diff --git a/arch/mips64/sgi-ip27/ip27-klnuma.c b/arch/mips64/sgi-ip27/ip27-klnuma.c index 5891e017e..c0accd440 100644 --- a/arch/mips64/sgi-ip27/ip27-klnuma.c +++ b/arch/mips64/sgi-ip27/ip27-klnuma.c @@ -1,6 +1,7 @@ /* * Ported from IRIX to Linux by Kanoj Sarcar, 06/08/00. - * Copyright 2000 Silicon Graphics, Inc. + * Copyright 2000 - 2001 Silicon Graphics, Inc. + * Copyright 2000 - 2001 Kanoj Sarcar (kanoj@sgi.com) */ #include <linux/config.h> #include <linux/init.h> @@ -9,6 +10,7 @@ #include <linux/string.h> #include <asm/page.h> +#include <asm/smp.h> #include <asm/sn/types.h> #include <asm/sn/arch.h> #include <asm/sn/gda.h> @@ -17,10 +19,6 @@ #include <asm/sn/mapped_kernel.h> #include <asm/sn/sn_private.h> -#define CPUMASK_CLRALL(p) (p) = 0 -#define CPUMASK_SETB(p, bit) (p) |= 1 << (bit) -#define CPUMASK_TSTB(p, bit) ((p) & (1ULL << (bit))) - extern char _end; static cpumask_t ktext_repmask; |