summaryrefslogtreecommitdiffstats
path: root/sys/sys
diff options
context:
space:
mode:
authorattilio <attilio@FreeBSD.org>2011-05-31 20:23:33 +0000
committerattilio <attilio@FreeBSD.org>2011-05-31 20:23:33 +0000
commit066c7ac96c87ad7070c7f2469bab58ef10a9f636 (patch)
treed811190871d9cb791aa676d24bde2a7f86176989 /sys/sys
parentb1bf71d3c513adb3ecd4c1c7f5448ff4e16ace0d (diff)
downloadFreeBSD-src-066c7ac96c87ad7070c7f2469bab58ef10a9f636.zip
FreeBSD-src-066c7ac96c87ad7070c7f2469bab58ef10a9f636.tar.gz
Revert a change that crept in during MFC.
Diffstat (limited to 'sys/sys')
-rw-r--r--sys/sys/cpuset.h1
-rw-r--r--sys/sys/ktr.h5
2 files changed, 1 insertions, 5 deletions
diff --git a/sys/sys/cpuset.h b/sys/sys/cpuset.h
index 030a874..4525263 100644
--- a/sys/sys/cpuset.h
+++ b/sys/sys/cpuset.h
@@ -214,7 +214,6 @@ int cpuset_create_root(struct prison *, struct cpuset **);
int cpuset_setproc_update_set(struct proc *, struct cpuset *);
int cpusetobj_ffs(const cpuset_t *);
char *cpusetobj_strprint(char *, const cpuset_t *);
-int cpusetobj_strscan(cpuset_t *, const char *);
#else
__BEGIN_DECLS
diff --git a/sys/sys/ktr.h b/sys/sys/ktr.h
index 7885b22..3b78101 100644
--- a/sys/sys/ktr.h
+++ b/sys/sys/ktr.h
@@ -97,9 +97,6 @@
#ifndef LOCORE
-#include <sys/param.h>
-#include <sys/_cpuset.h>
-
struct ktr_entry {
u_int64_t ktr_timestamp;
int ktr_cpu;
@@ -110,7 +107,7 @@ struct ktr_entry {
u_long ktr_parms[KTR_PARMS];
};
-extern cpuset_t ktr_cpumask;
+extern int ktr_cpumask;
extern int ktr_mask;
extern int ktr_entries;
extern int ktr_verbose;
OpenPOWER on IntegriCloud