mirror of
https://git.FreeBSD.org/src.git
synced 2025-01-19 15:33:56 +00:00
sysctl(9) cleanup checkpoint: amd64 GENERIC builds cleanly.
Commit the kernel changes.
This commit is contained in:
parent
123d2cb7e9
commit
fbbb13f962
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=217326
@ -68,7 +68,7 @@ acpi_machdep_init(device_t dev)
|
||||
if (intr_model != ACPI_INTR_PIC)
|
||||
acpi_SetIntrModel(intr_model);
|
||||
|
||||
SYSCTL_ADD_UINT(&sc->acpi_sysctl_ctx,
|
||||
SYSCTL_ADD_INT(&sc->acpi_sysctl_ctx,
|
||||
SYSCTL_CHILDREN(sc->acpi_sysctl_tree), OID_AUTO,
|
||||
"reset_video", CTLFLAG_RW, &acpi_reset_video, 0,
|
||||
"Call the VESA reset BIOS vector on the resume path");
|
||||
|
@ -90,7 +90,7 @@ SYSCTL_UINT(_debug_ddb_capture, OID_AUTO, maxbufsize, CTLFLAG_RD,
|
||||
&db_capture_maxbufsize, 0,
|
||||
"Maximum value for debug.ddb.capture.bufsize");
|
||||
|
||||
SYSCTL_UINT(_debug_ddb_capture, OID_AUTO, inprogress, CTLFLAG_RD,
|
||||
SYSCTL_INT(_debug_ddb_capture, OID_AUTO, inprogress, CTLFLAG_RD,
|
||||
&db_capture_inprogress, 0, "DDB output capture in progress");
|
||||
|
||||
/*
|
||||
|
@ -114,7 +114,7 @@ SYSCTL_INT(_kern_eventtimer, OID_AUTO, singlemul, CTLFLAG_RW, &singlemul,
|
||||
|
||||
static u_int idletick = 0; /* Idle mode allowed. */
|
||||
TUNABLE_INT("kern.eventtimer.idletick", &idletick);
|
||||
SYSCTL_INT(_kern_eventtimer, OID_AUTO, idletick, CTLFLAG_RW, &idletick,
|
||||
SYSCTL_UINT(_kern_eventtimer, OID_AUTO, idletick, CTLFLAG_RW, &idletick,
|
||||
0, "Run periodic events when idle");
|
||||
|
||||
static int periodic = 0; /* Periodic or one-shot mode. */
|
||||
|
@ -65,10 +65,10 @@ et_register(struct eventtimer *et)
|
||||
et->et_sysctl = SYSCTL_ADD_NODE(NULL,
|
||||
SYSCTL_STATIC_CHILDREN(_kern_eventtimer_et), OID_AUTO, et->et_name,
|
||||
CTLFLAG_RW, 0, "event timer description");
|
||||
SYSCTL_ADD_UINT(NULL, SYSCTL_CHILDREN(et->et_sysctl), OID_AUTO,
|
||||
SYSCTL_ADD_INT(NULL, SYSCTL_CHILDREN(et->et_sysctl), OID_AUTO,
|
||||
"flags", CTLFLAG_RD, &(et->et_flags), 0,
|
||||
"Event timer capabilities");
|
||||
SYSCTL_ADD_QUAD(NULL, SYSCTL_CHILDREN(et->et_sysctl), OID_AUTO,
|
||||
SYSCTL_ADD_UQUAD(NULL, SYSCTL_CHILDREN(et->et_sysctl), OID_AUTO,
|
||||
"frequency", CTLFLAG_RD, &(et->et_frequency),
|
||||
"Event timer base frequency");
|
||||
SYSCTL_ADD_INT(NULL, SYSCTL_CHILDREN(et->et_sysctl), OID_AUTO,
|
||||
|
@ -203,7 +203,7 @@ sysctl_hw_usermem(SYSCTL_HANDLER_ARGS)
|
||||
SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_ULONG | CTLFLAG_RD,
|
||||
0, 0, sysctl_hw_usermem, "LU", "");
|
||||
|
||||
SYSCTL_ULONG(_hw, OID_AUTO, availpages, CTLFLAG_RD, &physmem, 0, "");
|
||||
SYSCTL_LONG(_hw, OID_AUTO, availpages, CTLFLAG_RD, &physmem, 0, "");
|
||||
|
||||
u_long pagesizes[MAXPAGESIZES] = { PAGE_SIZE };
|
||||
|
||||
|
@ -137,8 +137,8 @@ struct lock_class lock_class_sx = {
|
||||
static u_int asx_retries = 10;
|
||||
static u_int asx_loops = 10000;
|
||||
SYSCTL_NODE(_debug, OID_AUTO, sx, CTLFLAG_RD, NULL, "sxlock debugging");
|
||||
SYSCTL_INT(_debug_sx, OID_AUTO, retries, CTLFLAG_RW, &asx_retries, 0, "");
|
||||
SYSCTL_INT(_debug_sx, OID_AUTO, loops, CTLFLAG_RW, &asx_loops, 0, "");
|
||||
SYSCTL_UINT(_debug_sx, OID_AUTO, retries, CTLFLAG_RW, &asx_retries, 0, "");
|
||||
SYSCTL_UINT(_debug_sx, OID_AUTO, loops, CTLFLAG_RW, &asx_loops, 0, "");
|
||||
#endif
|
||||
|
||||
void
|
||||
|
@ -73,7 +73,7 @@ static int kobj_next_id = 1;
|
||||
#define KOBJ_UNLOCK() if (kobj_mutex_inited) mtx_unlock(&kobj_mtx);
|
||||
#define KOBJ_ASSERT(what) if (kobj_mutex_inited) mtx_assert(&kobj_mtx,what);
|
||||
|
||||
SYSCTL_UINT(_kern, OID_AUTO, kobj_methodcount, CTLFLAG_RD,
|
||||
SYSCTL_INT(_kern, OID_AUTO, kobj_methodcount, CTLFLAG_RD,
|
||||
&kobj_next_id, 0, "");
|
||||
|
||||
static void
|
||||
|
@ -73,7 +73,7 @@ u_int mp_maxid;
|
||||
|
||||
SYSCTL_NODE(_kern, OID_AUTO, smp, CTLFLAG_RD, NULL, "Kernel SMP");
|
||||
|
||||
SYSCTL_INT(_kern_smp, OID_AUTO, maxid, CTLFLAG_RD, &mp_maxid, 0,
|
||||
SYSCTL_UINT(_kern_smp, OID_AUTO, maxid, CTLFLAG_RD, &mp_maxid, 0,
|
||||
"Max CPU ID.");
|
||||
|
||||
SYSCTL_INT(_kern_smp, OID_AUTO, maxcpus, CTLFLAG_RD, &mp_maxcpus, 0,
|
||||
|
@ -122,7 +122,7 @@ static void destroy_vpollinfo(struct vpollinfo *vi);
|
||||
*/
|
||||
static unsigned long numvnodes;
|
||||
|
||||
SYSCTL_LONG(_vfs, OID_AUTO, numvnodes, CTLFLAG_RD, &numvnodes, 0,
|
||||
SYSCTL_ULONG(_vfs, OID_AUTO, numvnodes, CTLFLAG_RD, &numvnodes, 0,
|
||||
"Number of vnodes in existence");
|
||||
|
||||
/*
|
||||
@ -149,10 +149,10 @@ static TAILQ_HEAD(freelst, vnode) vnode_free_list;
|
||||
* should be kept to avoid recreation costs.
|
||||
*/
|
||||
static u_long wantfreevnodes;
|
||||
SYSCTL_LONG(_vfs, OID_AUTO, wantfreevnodes, CTLFLAG_RW, &wantfreevnodes, 0, "");
|
||||
SYSCTL_ULONG(_vfs, OID_AUTO, wantfreevnodes, CTLFLAG_RW, &wantfreevnodes, 0, "");
|
||||
/* Number of vnodes in the free list. */
|
||||
static u_long freevnodes;
|
||||
SYSCTL_LONG(_vfs, OID_AUTO, freevnodes, CTLFLAG_RD, &freevnodes, 0,
|
||||
SYSCTL_ULONG(_vfs, OID_AUTO, freevnodes, CTLFLAG_RD, &freevnodes, 0,
|
||||
"Number of vnodes in the free list");
|
||||
|
||||
static int vlru_allow_cache_src;
|
||||
@ -270,7 +270,7 @@ static enum { SYNCER_RUNNING, SYNCER_SHUTTING_DOWN, SYNCER_FINAL_DELAY }
|
||||
int desiredvnodes;
|
||||
SYSCTL_INT(_kern, KERN_MAXVNODES, maxvnodes, CTLFLAG_RW,
|
||||
&desiredvnodes, 0, "Maximum number of vnodes");
|
||||
SYSCTL_INT(_kern, OID_AUTO, minvnodes, CTLFLAG_RW,
|
||||
SYSCTL_ULONG(_kern, OID_AUTO, minvnodes, CTLFLAG_RW,
|
||||
&wantfreevnodes, 0, "Minimum number of vnodes (legacy)");
|
||||
static int vnlru_nowhere;
|
||||
SYSCTL_INT(_debug, OID_AUTO, vnlru_nowhere, CTLFLAG_RW,
|
||||
|
@ -862,9 +862,9 @@ nlm_create_host(const char* caller_name)
|
||||
OID_AUTO, host->nh_sysid_string, CTLFLAG_RD, NULL, "");
|
||||
SYSCTL_ADD_STRING(&host->nh_sysctl, SYSCTL_CHILDREN(oid), OID_AUTO,
|
||||
"hostname", CTLFLAG_RD, host->nh_caller_name, 0, "");
|
||||
SYSCTL_ADD_INT(&host->nh_sysctl, SYSCTL_CHILDREN(oid), OID_AUTO,
|
||||
SYSCTL_ADD_UINT(&host->nh_sysctl, SYSCTL_CHILDREN(oid), OID_AUTO,
|
||||
"version", CTLFLAG_RD, &host->nh_vers, 0, "");
|
||||
SYSCTL_ADD_INT(&host->nh_sysctl, SYSCTL_CHILDREN(oid), OID_AUTO,
|
||||
SYSCTL_ADD_UINT(&host->nh_sysctl, SYSCTL_CHILDREN(oid), OID_AUTO,
|
||||
"monitored", CTLFLAG_RD, &host->nh_monstate, 0, "");
|
||||
SYSCTL_ADD_PROC(&host->nh_sysctl, SYSCTL_CHILDREN(oid), OID_AUTO,
|
||||
"lock_count", CTLTYPE_INT | CTLFLAG_RD, host, 0,
|
||||
|
@ -138,12 +138,12 @@ svcpool_create(const char *name, struct sysctl_oid_list *sysctl_base)
|
||||
&pool->sp_space_low, 0,
|
||||
"Low water mark for request space.");
|
||||
|
||||
SYSCTL_ADD_UINT(&pool->sp_sysctl, sysctl_base, OID_AUTO,
|
||||
SYSCTL_ADD_INT(&pool->sp_sysctl, sysctl_base, OID_AUTO,
|
||||
"request_space_throttled", CTLFLAG_RD,
|
||||
&pool->sp_space_throttled, 0,
|
||||
"Whether nfs requests are currently throttled");
|
||||
|
||||
SYSCTL_ADD_UINT(&pool->sp_sysctl, sysctl_base, OID_AUTO,
|
||||
SYSCTL_ADD_INT(&pool->sp_sysctl, sysctl_base, OID_AUTO,
|
||||
"request_space_throttle_count", CTLFLAG_RD,
|
||||
&pool->sp_space_throttle_count, 0,
|
||||
"Count of times throttling based on request space has occurred");
|
||||
|
@ -622,9 +622,9 @@ SYSCTL_NODE(_debug_softdep, OID_AUTO, current, CTLFLAG_RW, 0,
|
||||
|
||||
#define SOFTDEP_TYPE(type, str, long) \
|
||||
static MALLOC_DEFINE(M_ ## type, #str, long); \
|
||||
SYSCTL_LONG(_debug_softdep_total, OID_AUTO, str, CTLFLAG_RD, \
|
||||
SYSCTL_ULONG(_debug_softdep_total, OID_AUTO, str, CTLFLAG_RD, \
|
||||
&dep_total[D_ ## type], 0, ""); \
|
||||
SYSCTL_LONG(_debug_softdep_current, OID_AUTO, str, CTLFLAG_RD, \
|
||||
SYSCTL_ULONG(_debug_softdep_current, OID_AUTO, str, CTLFLAG_RD, \
|
||||
&dep_current[D_ ## type], 0, "");
|
||||
|
||||
SOFTDEP_TYPE(PAGEDEP, pagedep, "File page dependencies");
|
||||
|
@ -1060,9 +1060,9 @@ alloc_bounce_zone(bus_dma_tag_t dmat)
|
||||
SYSCTL_ADD_STRING(busdma_sysctl_tree(bz),
|
||||
SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
|
||||
"lowaddr", CTLFLAG_RD, bz->lowaddrid, 0, "");
|
||||
SYSCTL_ADD_INT(busdma_sysctl_tree(bz),
|
||||
SYSCTL_ADD_UQUAD(busdma_sysctl_tree(bz),
|
||||
SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
|
||||
"alignment", CTLFLAG_RD, &bz->alignment, 0, "");
|
||||
"alignment", CTLFLAG_RD, &bz->alignment, "");
|
||||
|
||||
return (0);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user