D14212.1785236182.diff
No OneTemporary
Actions

Size

23 KB

Referenced Files

None

Subscribers

None

D14212.1785236182.diff
View Options

	Index: sys/amd64/amd64/pmap.c
	===================================================================
	--- sys/amd64/amd64/pmap.c
	+++ sys/amd64/amd64/pmap.c
	@@ -7421,19 +7421,23 @@
	#ifdef INVARIANTS
	static unsigned long num_dirty_emulations;
	SYSCTL_ULONG(_vm_pmap, OID_AUTO, num_dirty_emulations, CTLFLAG_RW,
	- &num_dirty_emulations, 0, NULL);
	+ &num_dirty_emulations, 0,
	+ "Number of dirty emulations");

	static unsigned long num_accessed_emulations;
	SYSCTL_ULONG(_vm_pmap, OID_AUTO, num_accessed_emulations, CTLFLAG_RW,
	- &num_accessed_emulations, 0, NULL);
	+ &num_accessed_emulations, 0,
	+ "Count of accessed bit emulations");

	static unsigned long num_superpage_accessed_emulations;
	SYSCTL_ULONG(_vm_pmap, OID_AUTO, num_superpage_accessed_emulations, CTLFLAG_RW,
	- &num_superpage_accessed_emulations, 0, NULL);
	+ &num_superpage_accessed_emulations, 0,
	+ "Count of accessed bit emulations for superpages");

	static unsigned long ad_emulation_superpage_promotions;
	SYSCTL_ULONG(_vm_pmap, OID_AUTO, ad_emulation_superpage_promotions, CTLFLAG_RW,
	- &ad_emulation_superpage_promotions, 0, NULL);
	+ &ad_emulation_superpage_promotions, 0,
	+ "Superpage promotions attempted by AD");
	#endif /* INVARIANTS */

	int
	Index: sys/arm/arm/busdma_machdep-v4.c
	===================================================================
	--- sys/arm/arm/busdma_machdep-v4.c
	+++ sys/arm/arm/busdma_machdep-v4.c
	@@ -1425,7 +1425,8 @@
	sysctl_ctx_init(&bz->sysctl_tree);
	bz->sysctl_tree_top = SYSCTL_ADD_NODE(&bz->sysctl_tree,
	SYSCTL_STATIC_CHILDREN(_hw_busdma), OID_AUTO, bz->zoneid,
	- CTLFLAG_RD, 0, "");
	+ CTLFLAG_RD, 0,
	+ "Busdma zone parameters");
	if (bz->sysctl_tree_top == NULL) {
	sysctl_ctx_free(&bz->sysctl_tree);
	return (0); /* XXX error code? */
	@@ -1457,10 +1458,12 @@
	"Total bounce requests that were deferred");
	SYSCTL_ADD_STRING(busdma_sysctl_tree(bz),
	SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
	- "lowaddr", CTLFLAG_RD, bz->lowaddrid, 0, "");
	+ "lowaddr", CTLFLAG_RD, bz->lowaddrid, 0,
	+ "Bounce zone lower address value");
	SYSCTL_ADD_ULONG(busdma_sysctl_tree(bz),
	SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
	- "alignment", CTLFLAG_RD, &bz->alignment, "");
	+ "alignment", CTLFLAG_RD, &bz->alignment,
	+ "Bounce zone alignment in bytes");

	return (0);
	}
	Index: sys/arm/arm/busdma_machdep-v6.c
	===================================================================
	--- sys/arm/arm/busdma_machdep-v6.c
	+++ sys/arm/arm/busdma_machdep-v6.c
	@@ -1527,7 +1527,8 @@
	sysctl_ctx_init(&bz->sysctl_tree);
	bz->sysctl_tree_top = SYSCTL_ADD_NODE(&bz->sysctl_tree,
	SYSCTL_STATIC_CHILDREN(_hw_busdma), OID_AUTO, bz->zoneid,
	- CTLFLAG_RD, 0, "");
	+ CTLFLAG_RD, 0,
	+ "Busdma zone parameters");
	if (bz->sysctl_tree_top == NULL) {
	sysctl_ctx_free(&bz->sysctl_tree);
	return (0); /* XXX error code? */
	@@ -1559,10 +1560,12 @@
	"Total bounce requests that were deferred");
	SYSCTL_ADD_STRING(busdma_sysctl_tree(bz),
	SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
	- "lowaddr", CTLFLAG_RD, bz->lowaddrid, 0, "");
	+ "lowaddr", CTLFLAG_RD, bz->lowaddrid, 0,
	+ "Bounce zone lower address value");
	SYSCTL_ADD_ULONG(busdma_sysctl_tree(bz),
	SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
	- "alignment", CTLFLAG_RD, &bz->alignment, "");
	+ "alignment", CTLFLAG_RD, &bz->alignment,
	+ "Bounce zone alignment in bytes");

	return (0);
	}
	Index: sys/arm64/arm64/busdma_bounce.c
	===================================================================
	--- sys/arm64/arm64/busdma_bounce.c
	+++ sys/arm64/arm64/busdma_bounce.c
	@@ -1122,7 +1122,8 @@
	sysctl_ctx_init(&bz->sysctl_tree);
	bz->sysctl_tree_top = SYSCTL_ADD_NODE(&bz->sysctl_tree,
	SYSCTL_STATIC_CHILDREN(_hw_busdma), OID_AUTO, bz->zoneid,
	- CTLFLAG_RD, 0, "");
	+ CTLFLAG_RD, 0,
	+ "Busdma parameters");
	if (bz->sysctl_tree_top == NULL) {
	sysctl_ctx_free(&bz->sysctl_tree);
	return (0); /* XXX error code? */
	@@ -1154,10 +1155,12 @@
	"Total bounce requests that were deferred");
	SYSCTL_ADD_STRING(busdma_sysctl_tree(bz),
	SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
	- "lowaddr", CTLFLAG_RD, bz->lowaddrid, 0, "");
	+ "lowaddr", CTLFLAG_RD, bz->lowaddrid, 0,
	+ "Bounce zone lower address value");
	SYSCTL_ADD_UAUTO(busdma_sysctl_tree(bz),
	SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
	- "alignment", CTLFLAG_RD, &bz->alignment, "");
	+ "alignment", CTLFLAG_RD, &bz->alignment,
	+ "Bounce zone alignment in bytes");

	return (0);
	}
	Index: sys/geom/cache/g_cache.c
	===================================================================
	--- sys/geom/cache/g_cache.c
	+++ sys/geom/cache/g_cache.c
	@@ -57,13 +57,13 @@
	"Debug level");
	static u_int g_cache_enable = 1;
	SYSCTL_UINT(_kern_geom_cache, OID_AUTO, enable, CTLFLAG_RW, &g_cache_enable, 0,
	- "");
	+ "Enable cache");
	static u_int g_cache_timeout = 10;
	SYSCTL_UINT(_kern_geom_cache, OID_AUTO, timeout, CTLFLAG_RW, &g_cache_timeout,
	- 0, "");
	+ 0, "Cache timeout in seconds");
	static u_int g_cache_idletime = 5;
	SYSCTL_UINT(_kern_geom_cache, OID_AUTO, idletime, CTLFLAG_RW, &g_cache_idletime,
	- 0, "");
	+ 0, "Maximum time in seconds before idle cache entries are cleared");
	static u_int g_cache_used_lo = 5;
	static u_int g_cache_used_hi = 20;
	static int
	@@ -84,9 +84,11 @@
	return (0);
	}
	SYSCTL_PROC(_kern_geom_cache, OID_AUTO, used_lo, CTLTYPE_UINT\|CTLFLAG_RW,
	- &g_cache_used_lo, 0, sysctl_handle_pct, "IU", "");
	+ &g_cache_used_lo, 0, sysctl_handle_pct, "IU",
	+ "Minimum cache entries");
	SYSCTL_PROC(_kern_geom_cache, OID_AUTO, used_hi, CTLTYPE_UINT\|CTLFLAG_RW,
	- &g_cache_used_hi, 0, sysctl_handle_pct, "IU", "");
	+ &g_cache_used_hi, 0, sysctl_handle_pct, "IU",
	+ "Maximum cache entries");


	static int g_cache_destroy(struct g_cache_softc *sc, boolean_t force);
	Index: sys/kern/kern_exec.c
	===================================================================
	--- sys/kern/kern_exec.c
	+++ sys/kern/kern_exec.c
	@@ -124,18 +124,22 @@

	/* XXX This should be vm_size_t. */
	SYSCTL_PROC(_kern, KERN_PS_STRINGS, ps_strings, CTLTYPE_ULONG\|CTLFLAG_RD\|
	- CTLFLAG_MPSAFE, NULL, 0, sysctl_kern_ps_strings, "LU", "");
	+ CTLFLAG_MPSAFE, NULL, 0, sysctl_kern_ps_strings, "LU",
	+ "Address of PS_STRINGS");

	/* XXX This should be vm_size_t. */
	SYSCTL_PROC(_kern, KERN_USRSTACK, usrstack, CTLTYPE_ULONG\|CTLFLAG_RD\|
	- CTLFLAG_CAPRD\|CTLFLAG_MPSAFE, NULL, 0, sysctl_kern_usrstack, "LU", "");
	+ CTLFLAG_CAPRD\|CTLFLAG_MPSAFE, NULL, 0, sysctl_kern_usrstack, "LU",
	+ "Address of USRSTACK");

	SYSCTL_PROC(_kern, OID_AUTO, stackprot, CTLTYPE_INT\|CTLFLAG_RD\|CTLFLAG_MPSAFE,
	- NULL, 0, sysctl_kern_stackprot, "I", "");
	+ NULL, 0, sysctl_kern_stackprot, "I",
	+ "Stack protection flags");

	u_long ps_arg_cache_limit = PAGE_SIZE / 16;
	-SYSCTL_ULONG(_kern, OID_AUTO, ps_arg_cache_limit, CTLFLAG_RW,
	- &ps_arg_cache_limit, 0, "");
	+SYSCTL_ULONG(_kern, OID_AUTO, ps_arg_cache_limit, CTLFLAG_RW,
	+ &ps_arg_cache_limit, 0,
	+ "Process argument cache limit");

	static int disallow_high_osrel;
	SYSCTL_INT(_kern, OID_AUTO, disallow_high_osrel, CTLFLAG_RW,
	Index: sys/kern/kern_mib.c
	===================================================================
	--- sys/kern/kern_mib.c
	+++ sys/kern/kern_mib.c
	@@ -190,7 +190,8 @@
	}

	SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_ULONG \| CTLFLAG_RD,
	- 0, 0, sysctl_hw_physmem, "LU", "");
	+ 0, 0, sysctl_hw_physmem, "LU",
	+ "Bytes of usable memory");

	static int
	sysctl_hw_realmem(SYSCTL_HANDLER_ARGS)
	@@ -200,7 +201,8 @@
	return (sysctl_handle_long(oidp, &val, 0, req));
	}
	SYSCTL_PROC(_hw, HW_REALMEM, realmem, CTLTYPE_ULONG \| CTLFLAG_RD,
	- 0, 0, sysctl_hw_realmem, "LU", "");
	+ 0, 0, sysctl_hw_realmem, "LU",
	+ "Total system memory");
	static int
	sysctl_hw_usermem(SYSCTL_HANDLER_ARGS)
	{
	@@ -211,9 +213,11 @@
	}

	SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_ULONG \| CTLFLAG_RD,
	- 0, 0, sysctl_hw_usermem, "LU", "");
	+ 0, 0, sysctl_hw_usermem, "LU",
	+ "Bytes of non-kernel memory");

	-SYSCTL_LONG(_hw, OID_AUTO, availpages, CTLFLAG_RD, &physmem, 0, "");
	+SYSCTL_LONG(_hw, OID_AUTO, availpages, CTLFLAG_RD, &physmem, 0,
	+ "Number of available memory pages");

	u_long pagesizes[MAXPAGESIZES] = { PAGE_SIZE };

	Index: sys/kern/kern_ntptime.c
	===================================================================
	--- sys/kern/kern_ntptime.c
	+++ sys/kern/kern_ntptime.c
	@@ -305,10 +305,11 @@
	return (sysctl_handle_opaque(oidp, &ntv, sizeof(ntv), req));
	}

	-SYSCTL_NODE(_kern, OID_AUTO, ntp_pll, CTLFLAG_RW, 0, "");
	+SYSCTL_NODE(_kern, OID_AUTO, ntp_pll, CTLFLAG_RW, 0,
	+ "NTP parameters");
	SYSCTL_PROC(_kern_ntp_pll, OID_AUTO, gettime, CTLTYPE_OPAQUE \| CTLFLAG_RD \|
	- CTLFLAG_MPSAFE, 0, sizeof(struct ntptimeval) , ntp_sysctl, "S,ntptimeval",
	- "");
	+ CTLFLAG_MPSAFE, 0, sizeof(struct ntptimeval), ntp_sysctl, "S,ntptimeval",
	+ "Current NTP time");

	#ifdef PPS_SYNC
	SYSCTL_INT(_kern_ntp_pll, OID_AUTO, pps_shiftmax, CTLFLAG_RW,
	Index: sys/kern/kern_shutdown.c
	===================================================================
	--- sys/kern/kern_shutdown.c
	+++ sys/kern/kern_shutdown.c
	@@ -152,11 +152,13 @@
	static int show_busybufs = 1;
	#endif
	SYSCTL_INT(_kern_shutdown, OID_AUTO, show_busybufs, CTLFLAG_RW,
	- &show_busybufs, 0, "");
	+ &show_busybufs, 0,
	+ "Print busy buffers during shutdown");

	int suspend_blocked = 0;
	SYSCTL_INT(_kern, OID_AUTO, suspend_blocked, CTLFLAG_RW,
	- &suspend_blocked, 0, "Block suspend due to a pending shutdown");
	+ &suspend_blocked, 0,
	+ "Block suspend due to a pending shutdown");

	#ifdef EKCD
	FEATURE(ekcd, "Encrypted kernel crash dumps support");
	Index: sys/kern/kern_synch.c
	===================================================================
	--- sys/kern/kern_synch.c
	+++ sys/kern/kern_synch.c
	@@ -90,7 +90,8 @@
	};

	/* kernel uses `FSCALE', userland (SHOULD) use kern.fscale */
	-SYSCTL_INT(_kern, OID_AUTO, fscale, CTLFLAG_RD, SYSCTL_NULL_INT_PTR, FSCALE, "");
	+SYSCTL_INT(_kern, OID_AUTO, fscale, CTLFLAG_RD, SYSCTL_NULL_INT_PTR, FSCALE,
	+ "Constant used for load calculations");

	static void loadav(void *arg);

	Index: sys/kern/kern_tc.c
	===================================================================
	--- sys/kern/kern_tc.c
	+++ sys/kern/kern_tc.c
	@@ -109,7 +109,8 @@
	SYSCTL_PROC(_kern, KERN_BOOTTIME, boottime, CTLTYPE_STRUCT\|CTLFLAG_RD,
	NULL, 0, sysctl_kern_boottime, "S,timeval", "System boottime");

	-SYSCTL_NODE(_kern, OID_AUTO, timecounter, CTLFLAG_RW, 0, "");
	+SYSCTL_NODE(_kern, OID_AUTO, timecounter, CTLFLAG_RW, 0,
	+ "Timecounter params");
	static SYSCTL_NODE(_kern_timecounter, OID_AUTO, tc, CTLFLAG_RW, 0, "");

	static int timestepwarnings;
	Index: sys/kern/kern_umtx.c
	===================================================================
	--- sys/kern/kern_umtx.c
	+++ sys/kern/kern_umtx.c
	@@ -241,7 +241,7 @@
	static int umtx_max_rb = 1000;
	SYSCTL_INT(_kern_ipc, OID_AUTO, umtx_max_robust, CTLFLAG_RWTUN,
	&umtx_max_rb, 0,
	- "");
	+ "Maximum robust mutexes per thread");

	static uma_zone_t umtx_pi_zone;
	static struct umtxq_chain umtxq_chains[2][UMTX_CHAINS];
	Index: sys/kern/sched_4bsd.c
	===================================================================
	--- sys/kern/sched_4bsd.c
	+++ sys/kern/sched_4bsd.c
	@@ -434,7 +434,8 @@

	/* decay 95% of `ts_pctcpu' in 60 seconds; see CCPU_SHIFT before changing */
	static fixpt_t ccpu = 0.95122942450071400909 * FSCALE; /* exp(-1/20) */
	-SYSCTL_UINT(_kern, OID_AUTO, ccpu, CTLFLAG_RD, &ccpu, 0, "");
	+SYSCTL_UINT(_kern, OID_AUTO, ccpu, CTLFLAG_RD, &ccpu, 0,
	+ "Constant exp(-1/20)");

	/*
	* If `ccpu' is not equal to `exp(-1/20)' and you still want to use the
	Index: sys/kern/sched_ule.c
	===================================================================
	--- sys/kern/sched_ule.c
	+++ sys/kern/sched_ule.c
	@@ -2955,4 +2955,5 @@

	/* ps compat. All cpu percentages from ULE are weighted. */
	static int ccpu = 0;
	-SYSCTL_INT(_kern, OID_AUTO, ccpu, CTLFLAG_RD, &ccpu, 0, "");
	+SYSCTL_INT(_kern, OID_AUTO, ccpu, CTLFLAG_RD, &ccpu, 0,
	+ "Dummy variable for ps compatibility");
	Index: sys/kern/subr_kobj.c
	===================================================================
	--- sys/kern/subr_kobj.c
	+++ sys/kern/subr_kobj.c
	@@ -52,9 +52,11 @@
	u_int kobj_lookup_misses;

	SYSCTL_UINT(_kern, OID_AUTO, kobj_hits, CTLFLAG_RD,
	- &kobj_lookup_hits, 0, "");
	+ &kobj_lookup_hits, 0,
	+ "Number of kobj cache hits");
	SYSCTL_UINT(_kern, OID_AUTO, kobj_misses, CTLFLAG_RD,
	- &kobj_lookup_misses, 0, "");
	+ &kobj_lookup_misses, 0,
	+ "Number of kobj cache misses");

	#endif

	@@ -66,8 +68,9 @@
	#define KOBJ_UNLOCK() mtx_unlock(&kobj_mtx)
	#define KOBJ_ASSERT(what) mtx_assert(&kobj_mtx, what);

	-SYSCTL_INT(_kern, OID_AUTO, kobj_methodcount, CTLFLAG_RD,
	- &kobj_next_id, 0, "");
	+SYSCTL_INT(_kern, OID_AUTO, kobj_methodcount,
	+ CTLFLAG_RD, &kobj_next_id, 0,
	+ "Number of kobj methods registered in system");

	static void
	kobj_init_mutex(void *arg)
	Index: sys/kern/subr_log.c
	===================================================================
	--- sys/kern/subr_log.c
	+++ sys/kern/subr_log.c
	@@ -101,7 +101,8 @@
	/* Times per second to check for a pending syslog wakeup. */
	static int log_wakeups_per_second = 5;
	SYSCTL_INT(_kern, OID_AUTO, log_wakeups_per_second, CTLFLAG_RW,
	- &log_wakeups_per_second, 0, "");
	+ &log_wakeups_per_second, 0,
	+ "Times per second to check for syslog wakeup");

	/ARGSUSED/
	static int
	Index: sys/kern/uipc_mbuf.c
	===================================================================
	--- sys/kern/uipc_mbuf.c
	+++ sys/kern/uipc_mbuf.c
	@@ -111,24 +111,33 @@
	* sysctl(8) exported objects
	*/
	SYSCTL_INT(_kern_ipc, KIPC_MAX_LINKHDR, max_linkhdr, CTLFLAG_RD,
	- &max_linkhdr, 0, "Size of largest link layer header");
	+ &max_linkhdr, 0,
	+ "Size of largest link layer header");
	SYSCTL_INT(_kern_ipc, KIPC_MAX_PROTOHDR, max_protohdr, CTLFLAG_RD,
	- &max_protohdr, 0, "Size of largest protocol layer header");
	+ &max_protohdr, 0,
	+ "Size of largest protocol layer header");
	SYSCTL_INT(_kern_ipc, KIPC_MAX_HDR, max_hdr, CTLFLAG_RD,
	- &max_hdr, 0, "Size of largest link plus protocol header");
	+ &max_hdr, 0,
	+ "Size of largest link plus protocol header");
	SYSCTL_INT(_kern_ipc, KIPC_MAX_DATALEN, max_datalen, CTLFLAG_RD,
	- &max_datalen, 0, "Minimum space left in mbuf after max_hdr");
	+ &max_datalen, 0,
	+ "Minimum space left in mbuf after max_hdr");
	#ifdef MBUF_STRESS_TEST
	SYSCTL_INT(_kern_ipc, OID_AUTO, m_defragpackets, CTLFLAG_RD,
	- &m_defragpackets, 0, "");
	+ &m_defragpackets, 0,
	+ "Message buffer defrag packets");
	SYSCTL_INT(_kern_ipc, OID_AUTO, m_defragbytes, CTLFLAG_RD,
	- &m_defragbytes, 0, "");
	-SYSCTL_INT(_kern_ipc, OID_AUTO, m_defraguseless, CTLFLAG_RD,
	- &m_defraguseless, 0, "");
	+ &m_defragbytes, 0,
	+ "Message buffer defrag bytes");
	+YSCTL_INT(_kern_ipc, OID_AUTO, m_defraguseless, CTLFLAG_RD,
	+ &m_defraguseless, 0,
	+ "Message buffer defrag useless entries");
	SYSCTL_INT(_kern_ipc, OID_AUTO, m_defragfailure, CTLFLAG_RD,
	- &m_defragfailure, 0, "");
	+ &m_defragfailure, 0,
	+ "Message buffer defrag failures");
	SYSCTL_INT(_kern_ipc, OID_AUTO, m_defragrandomfailures, CTLFLAG_RW,
	- &m_defragrandomfailures, 0, "");
	+ &m_defragrandomfailures, 0,
	+ "Message buffer defrag random failures");
	#endif

	/*
	Index: sys/kern/uipc_sockbuf.c
	===================================================================
	--- sys/kern/uipc_sockbuf.c
	+++ sys/kern/uipc_sockbuf.c
	@@ -1408,8 +1408,11 @@

	/* This takes the place of kern.maxsockbuf, which moved to kern.ipc. */
	static int dummy;
	-SYSCTL_INT(_kern, KERN_DUMMY, dummy, CTLFLAG_RW, &dummy, 0, "");
	+SYSCTL_INT(_kern, KERN_DUMMY, dummy, CTLFLAG_RW, &dummy, 0,
	+ "Dummy");
	SYSCTL_OID(_kern_ipc, KIPC_MAXSOCKBUF, maxsockbuf, CTLTYPE_ULONG\|CTLFLAG_RW,
	- &sb_max, 0, sysctl_handle_sb_max, "LU", "Maximum socket buffer size");
	+ &sb_max, 0, sysctl_handle_sb_max,
	+ "LU", "Maximum socket buffer size");
	SYSCTL_ULONG(_kern_ipc, KIPC_SOCKBUF_WASTE, sockbuf_waste_factor, CTLFLAG_RW,
	- &sb_efficiency, 0, "Socket buffer size waste factor");
	+ &sb_efficiency, 0,
	+ "Socket buffer size waste factor");
	Index: sys/mips/mips/busdma_machdep.c
	===================================================================
	--- sys/mips/mips/busdma_machdep.c
	+++ sys/mips/mips/busdma_machdep.c
	@@ -1328,7 +1328,8 @@
	sysctl_ctx_init(&bz->sysctl_tree);
	bz->sysctl_tree_top = SYSCTL_ADD_NODE(&bz->sysctl_tree,
	SYSCTL_STATIC_CHILDREN(_hw_busdma), OID_AUTO, bz->zoneid,
	- CTLFLAG_RD, 0, "");
	+ CTLFLAG_RD, 0,
	+ "Busdma zone parameters");
	if (bz->sysctl_tree_top == NULL) {
	sysctl_ctx_free(&bz->sysctl_tree);
	return (0); /* XXX error code? */
	@@ -1360,10 +1361,12 @@
	"Total bounce requests that were deferred");
	SYSCTL_ADD_STRING(busdma_sysctl_tree(bz),
	SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
	- "lowaddr", CTLFLAG_RD, bz->lowaddrid, 0, "");
	+ "lowaddr", CTLFLAG_RD, bz->lowaddrid, 0,
	+ "Bounce zone lower address value");
	SYSCTL_ADD_UAUTO(busdma_sysctl_tree(bz),
	SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
	- "alignment", CTLFLAG_RD, &bz->alignment, "");
	+ "alignment", CTLFLAG_RD, &bz->alignment,
	+ "Bounce zone alignment in bytes");

	return (0);
	}
	Index: sys/powerpc/powerpc/busdma_machdep.c
	===================================================================
	--- sys/powerpc/powerpc/busdma_machdep.c
	+++ sys/powerpc/powerpc/busdma_machdep.c
	@@ -1023,7 +1023,8 @@
	sysctl_ctx_init(&bz->sysctl_tree);
	bz->sysctl_tree_top = SYSCTL_ADD_NODE(&bz->sysctl_tree,
	SYSCTL_STATIC_CHILDREN(_hw_busdma), OID_AUTO, bz->zoneid,
	- CTLFLAG_RD, 0, "");
	+ CTLFLAG_RD, 0,
	+ "Busdma zone parameters");
	if (bz->sysctl_tree_top == NULL) {
	sysctl_ctx_free(&bz->sysctl_tree);
	return (0); /* XXX error code? */
	@@ -1055,10 +1056,12 @@
	"Total bounce requests that were deferred");
	SYSCTL_ADD_STRING(busdma_sysctl_tree(bz),
	SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
	- "lowaddr", CTLFLAG_RD, bz->lowaddrid, 0, "");
	+ "lowaddr", CTLFLAG_RD, bz->lowaddrid, 0,
	+ "Bounce zone lower address value");
	SYSCTL_ADD_UAUTO(busdma_sysctl_tree(bz),
	SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
	- "alignment", CTLFLAG_RD, &bz->alignment, "");
	+ "alignment", CTLFLAG_RD, &bz->alignment,
	+ "Bounce zone alignment in bytes");

	return (0);
	}
	Index: sys/powerpc/powerpc/cpu.c
	===================================================================
	--- sys/powerpc/powerpc/cpu.c
	+++ sys/powerpc/powerpc/cpu.c
	@@ -213,7 +213,8 @@
	static int cpu_feature_bit(SYSCTL_HANDLER_ARGS);

	static char model[64];
	-SYSCTL_STRING(_hw, HW_MODEL, model, CTLFLAG_RD, model, 0, "");
	+SYSCTL_STRING(_hw, HW_MODEL, model, CTLFLAG_RD, model, 0,
	+ "Machine model");

	int cpu_features = PPC_FEATURE_32 \| PPC_FEATURE_HAS_MMU;
	int cpu_features2 = 0;
	Index: sys/powerpc/powerpc/elf32_machdep.c
	===================================================================
	--- sys/powerpc/powerpc/elf32_machdep.c
	+++ sys/powerpc/powerpc/elf32_machdep.c
	@@ -67,12 +67,14 @@

	#define PPC32_MAXDSIZ (102410241024)
	static u_long ppc32_maxdsiz = PPC32_MAXDSIZ;
	-SYSCTL_ULONG(_compat_ppc32, OID_AUTO, maxdsiz, CTLFLAG_RWTUN, &ppc32_maxdsiz,
	- 0, "");
	+SYSCTL_ULONG(_compat_ppc32, OID_AUTO, maxdsiz, CTLFLAG_RWTUN,
	+ &ppc32_maxdsiz, 0,
	+ "Max resource data size");
	#define PPC32_MAXSSIZ (6410241024)
	u_long ppc32_maxssiz = PPC32_MAXSSIZ;
	-SYSCTL_ULONG(_compat_ppc32, OID_AUTO, maxssiz, CTLFLAG_RWTUN, &ppc32_maxssiz,
	- 0, "");
	+SYSCTL_ULONG(_compat_ppc32, OID_AUTO, maxssiz, CTLFLAG_RWTUN,
	+ &ppc32_maxssiz, 0,
	+ "Max resource stack size");
	#endif

	struct sysentvec elf32_freebsd_sysvec = {
	Index: sys/powerpc/powerpc/machdep.c
	===================================================================
	--- sys/powerpc/powerpc/machdep.c
	+++ sys/powerpc/powerpc/machdep.c
	@@ -146,7 +146,8 @@
	static struct trapframe frame0;

	char machine[] = "powerpc";
	-SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD, machine, 0, "");
	+SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD, machine, 0,
	+ "Machine class");

	static void cpu_startup(void *);
	SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL);
	Index: sys/sparc64/sparc64/identcpu.c
	===================================================================
	--- sys/sparc64/sparc64/identcpu.c
	+++ sys/sparc64/sparc64/identcpu.c
	@@ -26,7 +26,8 @@
	SYSCTL_STRING(_hw, HW_MODEL, model, CTLFLAG_RD,
	cpu_model, 0, "Machine model");

	-static SYSCTL_NODE(_hw, OID_AUTO, freq, CTLFLAG_RD, 0, "");
	+static SYSCTL_NODE(_hw, OID_AUTO, freq, CTLFLAG_RD, 0,
	+ "Machine frequencies");

	static u_int cpu_count;
	static u_int cpu_freq;
	Index: sys/vm/vm_glue.c
	===================================================================
	--- sys/vm/vm_glue.c
	+++ sys/vm/vm_glue.c
	@@ -295,9 +295,9 @@
	MTX_SYSINIT(kstack_cache, &kstack_cache_mtx, "kstkch", MTX_DEF);

	SYSCTL_INT(_vm, OID_AUTO, kstack_cache_size, CTLFLAG_RW, &kstack_cache_size, 0,
	- "");
	+ "Size of the kernel stack cache");
	SYSCTL_INT(_vm, OID_AUTO, kstacks, CTLFLAG_RD, &kstacks, 0,
	- "");
	+ "Number of kernel stacks currently running");

	/*
	* Create the kernel stack (including pcb for i386) for a new thread.
	Index: sys/x86/iommu/intel_utils.c
	===================================================================
	--- sys/x86/iommu/intel_utils.c
	+++ sys/x86/iommu/intel_utils.c
	@@ -655,7 +655,8 @@
	return (error);
	}

	-static SYSCTL_NODE(_hw, OID_AUTO, dmar, CTLFLAG_RD, NULL, "");
	+static SYSCTL_NODE(_hw, OID_AUTO, dmar, CTLFLAG_RD, NULL,
	+ "DMA Remapping");
	SYSCTL_INT(_hw_dmar, OID_AUTO, tbl_pagecnt, CTLFLAG_RD,
	&dmar_tbl_pagecnt, 0,
	"Count of pages used for DMAR pagetables");
	Index: sys/x86/x86/busdma_bounce.c
	===================================================================
	--- sys/x86/x86/busdma_bounce.c
	+++ sys/x86/x86/busdma_bounce.c
	@@ -1095,7 +1095,8 @@
	sysctl_ctx_init(&bz->sysctl_tree);
	bz->sysctl_tree_top = SYSCTL_ADD_NODE(&bz->sysctl_tree,
	SYSCTL_STATIC_CHILDREN(_hw_busdma), OID_AUTO, bz->zoneid,
	- CTLFLAG_RD, 0, "");
	+ CTLFLAG_RD, 0,
	+ "Busdma zone parameters");
	if (bz->sysctl_tree_top == NULL) {
	sysctl_ctx_free(&bz->sysctl_tree);
	return (0); /* XXX error code? */
	@@ -1127,14 +1128,16 @@
	"Total bounce requests that were deferred");
	SYSCTL_ADD_STRING(busdma_sysctl_tree(bz),
	SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
	- "lowaddr", CTLFLAG_RD, bz->lowaddrid, 0, "");
	+ "lowaddr", CTLFLAG_RD, bz->lowaddrid, 0,
	+ "Bounce zone lower address value");
	SYSCTL_ADD_UAUTO(busdma_sysctl_tree(bz),
	SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
	- "alignment", CTLFLAG_RD, &bz->alignment, "");
	+ "alignment", CTLFLAG_RD, &bz->alignment,
	+ "Bounce zone alignment in bytes");
	SYSCTL_ADD_INT(busdma_sysctl_tree(bz),
	SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
	"domain", CTLFLAG_RD, &bz->domain, 0,
	- "memory domain");
	+ "Memory domain");

	return (0);
	}
	Index: sys/x86/x86/local_apic.c
	===================================================================
	--- sys/x86/x86/local_apic.c
	+++ sys/x86/x86/local_apic.c
	@@ -201,12 +201,16 @@
	#endif
	unsigned int max_apic_id;

	-SYSCTL_NODE(_hw, OID_AUTO, apic, CTLFLAG_RD, 0, "APIC options");
	-SYSCTL_INT(_hw_apic, OID_AUTO, x2apic_mode, CTLFLAG_RD, &x2apic_mode, 0, "");
	+SYSCTL_NODE(_hw, OID_AUTO, apic, CTLFLAG_RD, 0,
	+ "APIC options");
	+SYSCTL_INT(_hw_apic, OID_AUTO, x2apic_mode, CTLFLAG_RD, &x2apic_mode, 0,
	+ "x2APIC mode");
	SYSCTL_INT(_hw_apic, OID_AUTO, eoi_suppression, CTLFLAG_RD,
	- &lapic_eoi_suppression, 0, "");
	+ &lapic_eoi_suppression, 0,
	+ "EOI suppression mode");
	SYSCTL_INT(_hw_apic, OID_AUTO, timer_tsc_deadline, CTLFLAG_RD,
	- &lapic_timer_tsc_deadline, 0, "");
	+ &lapic_timer_tsc_deadline, 0,
	+ "Timer TSC-Deadline mode");

	static uint32_t
	lapic_read32(enum LAPIC_REGISTERS reg)

File Metadata

Mime Type: text/plain
Expires: Tue, Jul 28, 10:56 AM (18 h, 30 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 29289983
Default Alt Text: D14212.1785236182.diff (23 KB)

D14212.1785236182.diffNo OneTemporaryActions

D14212.1785236182.diffView Options

File Metadata

Event Timeline

D14212.1785236182.diff
No OneTemporary
Actions

D14212.1785236182.diff
View Options