diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-09-25 14:56:32 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-09-25 14:56:32 +0000 |
| commit | 31db0e37e1dc1c1e15a721732d617c1e429e1a5e (patch) | |
| tree | 7aa45c4ce08bcbf8f79ceca7f5a9b348cf7e3c94 | |
| parent | cbe5dc149d5a56e3232fda63f2264c5431b72ca7 (diff) | |
| download | illumos-joyent-31db0e37e1dc1c1e15a721732d617c1e429e1a5e.tar.gz | |
8643 Fix misuse of _KMEMUSER in i86pc [fix broken build]
| -rw-r--r-- | usr/src/uts/common/sys/cpuvar.h | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/usr/src/uts/common/sys/cpuvar.h b/usr/src/uts/common/sys/cpuvar.h index efd684735d..0b5d9d9d7b 100644 --- a/usr/src/uts/common/sys/cpuvar.h +++ b/usr/src/uts/common/sys/cpuvar.h @@ -388,7 +388,6 @@ extern cpu_core_t cpu_core[]; #define CPU_DISP_HALTED 0x02 /* CPU halted waiting for interrupt */ /* Note: inside ifdef: _KERNEL || _KMEMUSER || _BOOT */ -#if defined(_MACHDEP) /* * Macros for manipulating sets of CPUs as a bitmap. Note that this @@ -502,12 +501,7 @@ extern void cpuset_zero(cpuset_t *); #define CPUSET_ZERO(set) cpuset_zero(&(set)) -#endif /* defined(_MACHDEP) */ - - -extern cpuset_t cpu_seqid_inuse; - -#endif /* _MACHDEP */ +#endif /* _MACHDEP */ #endif /* _KERNEL || _KMEMUSER || _BOOT */ #define CPU_CPR_OFFLINE 0x0 @@ -518,6 +512,8 @@ extern cpuset_t cpu_seqid_inuse; #if defined(_KERNEL) || defined(_KMEMUSER) +extern cpuset_t cpu_seqid_inuse; + extern struct cpu *cpu[]; /* indexed by CPU number */ extern struct cpu **cpu_seq; /* indexed by sequential CPU id */ extern cpu_t *cpu_list; /* list of CPUs */ @@ -585,12 +581,6 @@ extern struct cpu *curcpup(void); #endif /* defined(_KERNEL) || defined(_KMEMUSER) */ -#define CPU_CPR_OFFLINE 0x0 -#define CPU_CPR_ONLINE 0x1 -#define CPU_CPR_IS_OFFLINE(cpu) (((cpu)->cpu_cpr_flags & CPU_CPR_ONLINE) == 0) -#define CPU_CPR_IS_ONLINE(cpu) ((cpu)->cpu_cpr_flags & CPU_CPR_ONLINE) -#define CPU_SET_CPR_FLAGS(cpu, flag) ((cpu)->cpu_cpr_flags |= flag) - /* * CPU support routines. */ |