aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorAttilio Rao <attilio@FreeBSD.org>2011-07-19 16:50:55 +0000
committerAttilio Rao <attilio@FreeBSD.org>2011-07-19 16:50:55 +0000
commit6338c57958b2acb79e0a459b84a4357f77993ae3 (patch)
tree93b13a7b0465647a6ec98c37c6a3f4360505773a /sys
parent886bbec19949f6175bdecb2db86804c6f8320145 (diff)
downloadsrc-6338c57958b2acb79e0a459b84a4357f77993ae3.tar.gz
src-6338c57958b2acb79e0a459b84a4357f77993ae3.zip
Remove explicit MAXCPU usage from sys/pcpu.h avoiding a namespace
pollution. That is a step further in the direction of building correct policies for userland and modules on how to deal with the number of maxcpus at runtime. Reported by: jhb Reviewed and tested by: pluknet Approved by: re (kib)
Notes
Notes: svn path=/head/; revision=224221
Diffstat (limited to 'sys')
-rw-r--r--sys/kern/sched_ule.c2
-rw-r--r--sys/sys/pcpu.h4
2 files changed, 2 insertions, 4 deletions
diff --git a/sys/kern/sched_ule.c b/sys/kern/sched_ule.c
index 05267f3d6adb..9bfb9e762242 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 e39f07baacc5..4a4ec005c0fd 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)