diff options
| -rw-r--r-- | sys/kern/sched_ule.c | 2 | ||||
| -rw-r--r-- | sys/sys/pcpu.h | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sys/kern/sched_ule.c b/sys/kern/sched_ule.c index 05267f3..9bfb9e7 100644 --- a/sys/kern/sched_ule.c +++ b/sys/kern/sched_ule.c @@ -84,7 +84,7 @@ dtrace_vtime_switch_func_t dtrace_vtime_switch_func; #define TS_NAME_LEN (MAXCOMLEN + sizeof(" td ") + sizeof(__XSTRING(UINT_MAX))) #define TDQ_NAME_LEN (sizeof("sched lock ") + sizeof(__XSTRING(MAXCPU))) -#define TDQ_LOADNAME_LEN (PCPU_NAME_LEN + sizeof(" load")) +#define TDQ_LOADNAME_LEN (sizeof("CPU ") + sizeof(__XSTRING(MAXCPU)) - 1 + sizeof(" load")) /* * Thread scheduler specific section. All fields are protected diff --git a/sys/sys/pcpu.h b/sys/sys/pcpu.h index e39f07b..4a4ec00 100644 --- a/sys/sys/pcpu.h +++ b/sys/sys/pcpu.h @@ -146,8 +146,6 @@ struct rm_queue { struct rm_queue* volatile rmq_prev; }; -#define PCPU_NAME_LEN (sizeof("CPU ") + sizeof(__XSTRING(MAXCPU)) - 1) - /* * This structure maps out the global data that needs to be kept on a * per-cpu basis. The members are accessed via the PCPU_GET/SET/PTR @@ -200,7 +198,7 @@ struct pcpu { STAILQ_HEAD(cpuhead, pcpu); extern struct cpuhead cpuhead; -extern struct pcpu *cpuid_to_pcpu[MAXCPU]; +extern struct pcpu *cpuid_to_pcpu[]; #define curcpu PCPU_GET(cpuid) #define curproc (curthread->td_proc) |
