Clean out sysctl machdep.* related defines.
The cmos clock related stuff should really be in MI code.
This commit is contained in:
parent
9690ea4717
commit
5d8c57a08b
@ -2240,13 +2240,13 @@ sysctl_machdep_adjkerntz(SYSCTL_HANDLER_ARGS)
|
||||
return (error);
|
||||
}
|
||||
|
||||
SYSCTL_PROC(_machdep, CPU_ADJKERNTZ, adjkerntz, CTLTYPE_INT|CTLFLAG_RW,
|
||||
SYSCTL_PROC(_machdep, OID_AUTO, adjkerntz, CTLTYPE_INT|CTLFLAG_RW,
|
||||
&adjkerntz, 0, sysctl_machdep_adjkerntz, "I", "");
|
||||
|
||||
SYSCTL_INT(_machdep, CPU_DISRTCSET, disable_rtc_set,
|
||||
SYSCTL_INT(_machdep, OID_AUTO, disable_rtc_set,
|
||||
CTLFLAG_RW, &disable_rtc_set, 0, "");
|
||||
|
||||
SYSCTL_INT(_machdep, CPU_WALLCLOCK, wall_cmos_clock,
|
||||
SYSCTL_INT(_machdep, OID_AUTO, wall_cmos_clock,
|
||||
CTLFLAG_RW, &wall_cmos_clock, 0, "");
|
||||
|
||||
void
|
||||
|
@ -55,29 +55,11 @@
|
||||
/*
|
||||
* CTL_MACHDEP definitions.
|
||||
*/
|
||||
#define CPU_CONSDEV 1 /* dev_t: console terminal device */
|
||||
#define CPU_ROOT_DEVICE 2 /* string: root device name */
|
||||
#define CPU_UNALIGNED_PRINT 3 /* int: print unaligned accesses */
|
||||
#define CPU_UNALIGNED_FIX 4 /* int: fix unaligned accesses */
|
||||
#define CPU_UNALIGNED_SIGBUS 5 /* int: SIGBUS unaligned accesses */
|
||||
#define CPU_BOOTED_KERNEL 6 /* string: booted kernel name */
|
||||
#define CPU_ADJKERNTZ 7 /* int: timezone offset (seconds) */
|
||||
#define CPU_DISRTCSET 8 /* int: disable resettodr() call */
|
||||
#define CPU_WALLCLOCK 9 /* int: indicates wall CMOS clock */
|
||||
#define CPU_MAXID 10 /* valid machdep IDs */
|
||||
|
||||
#define CTL_MACHDEP_NAMES { \
|
||||
{ 0, 0 }, \
|
||||
{ "console_device", CTLTYPE_STRUCT }, \
|
||||
{ "root_device", CTLTYPE_STRING }, \
|
||||
{ "unaligned_print", CTLTYPE_INT }, \
|
||||
{ "unaligned_fix", CTLTYPE_INT }, \
|
||||
{ "unaligned_sigbus", CTLTYPE_INT }, \
|
||||
{ "booted_kernel", CTLTYPE_STRING }, \
|
||||
{ "adjkerntz", CTLTYPE_INT }, \
|
||||
{ "disable_rtc_set", CTLTYPE_INT }, \
|
||||
{ "wall_cmos_clock", CTLTYPE_INT }, \
|
||||
}
|
||||
|
||||
#ifdef _KERNEL
|
||||
|
||||
|
@ -639,13 +639,13 @@ sysctl_machdep_adjkerntz(SYSCTL_HANDLER_ARGS)
|
||||
return (error);
|
||||
}
|
||||
|
||||
SYSCTL_PROC(_machdep, CPU_ADJKERNTZ, adjkerntz, CTLTYPE_INT|CTLFLAG_RW,
|
||||
SYSCTL_PROC(_machdep, OID_AUTO, adjkerntz, CTLTYPE_INT|CTLFLAG_RW,
|
||||
&adjkerntz, 0, sysctl_machdep_adjkerntz, "I", "");
|
||||
|
||||
SYSCTL_INT(_machdep, CPU_DISRTCSET, disable_rtc_set,
|
||||
SYSCTL_INT(_machdep, OID_AUTO, disable_rtc_set,
|
||||
CTLFLAG_RW, &disable_rtc_set, 0, "");
|
||||
|
||||
SYSCTL_INT(_machdep, CPU_WALLCLOCK, wall_cmos_clock,
|
||||
SYSCTL_INT(_machdep, OID_AUTO, wall_cmos_clock,
|
||||
CTLFLAG_RW, &wall_cmos_clock, 0, "");
|
||||
|
||||
/*
|
||||
|
@ -59,15 +59,6 @@
|
||||
(ISPL((framep)->tf_cs) == SEL_UPL)
|
||||
#define TRAPF_PC(framep) ((framep)->tf_rip)
|
||||
|
||||
/*
|
||||
* CTL_MACHDEP definitions.
|
||||
*/
|
||||
#define CPU_CONSDEV 1 /* dev_t: console terminal device */
|
||||
#define CPU_ADJKERNTZ 2 /* int: timezone offset (seconds) */
|
||||
#define CPU_DISRTCSET 3 /* int: disable resettodr() call */
|
||||
#define CPU_WALLCLOCK 5 /* int: indicates wall CMOS clock */
|
||||
#define CPU_MAXID 6 /* number of valid machdep ids */
|
||||
|
||||
#ifdef _KERNEL
|
||||
extern char btext[];
|
||||
extern char etext[];
|
||||
|
@ -21,14 +21,6 @@ get_cyclecount(void)
|
||||
}
|
||||
#endif
|
||||
|
||||
#define CPU_CONSDEV 1
|
||||
#define CPU_ADJKERNTZ 2 /* int: timezone offset (seconds) */
|
||||
#define CPU_DISRTCSET 3 /* int: disable resettodr() call */
|
||||
#define CPU_BOOTINFO 4 /* struct: bootinfo */
|
||||
#define CPU_WALLCLOCK 5 /* int: indicates wall CMOS clock */
|
||||
#define CPU_MAXID 6 /* number of valid machdep ids */
|
||||
|
||||
|
||||
#define TRAPF_USERMODE(frame) ((frame->tf_spsr & PSR_MODE) == PSR_USR32_MODE)
|
||||
|
||||
#define TRAPF_PC(tfp) ((tfp)->tf_pc)
|
||||
|
@ -1267,16 +1267,16 @@ sysctl_machdep_adjkerntz(SYSCTL_HANDLER_ARGS)
|
||||
return (error);
|
||||
}
|
||||
|
||||
SYSCTL_PROC(_machdep, CPU_ADJKERNTZ, adjkerntz, CTLTYPE_INT|CTLFLAG_RW,
|
||||
SYSCTL_PROC(_machdep, OID_AUTO, adjkerntz, CTLTYPE_INT|CTLFLAG_RW,
|
||||
&adjkerntz, 0, sysctl_machdep_adjkerntz, "I", "");
|
||||
|
||||
SYSCTL_INT(_machdep, CPU_DISRTCSET, disable_rtc_set,
|
||||
SYSCTL_INT(_machdep, OID_AUTO, disable_rtc_set,
|
||||
CTLFLAG_RW, &disable_rtc_set, 0, "");
|
||||
|
||||
SYSCTL_STRUCT(_machdep, CPU_BOOTINFO, bootinfo,
|
||||
SYSCTL_STRUCT(_machdep, OID_AUTO, bootinfo,
|
||||
CTLFLAG_RD, &bootinfo, bootinfo, "");
|
||||
|
||||
SYSCTL_INT(_machdep, CPU_WALLCLOCK, wall_cmos_clock,
|
||||
SYSCTL_INT(_machdep, OID_AUTO, wall_cmos_clock,
|
||||
CTLFLAG_RW, &wall_cmos_clock, 0, "");
|
||||
|
||||
u_long bootdev; /* not a struct cdev *- encoding is different */
|
||||
|
@ -59,25 +59,6 @@
|
||||
((ISPL((framep)->tf_cs) == SEL_UPL) || ((framep)->tf_eflags & PSL_VM))
|
||||
#define TRAPF_PC(framep) ((framep)->tf_eip)
|
||||
|
||||
/*
|
||||
* CTL_MACHDEP definitions.
|
||||
*/
|
||||
#define CPU_CONSDEV 1 /* dev_t: console terminal device */
|
||||
#define CPU_ADJKERNTZ 2 /* int: timezone offset (seconds) */
|
||||
#define CPU_DISRTCSET 3 /* int: disable resettodr() call */
|
||||
#define CPU_BOOTINFO 4 /* struct: bootinfo */
|
||||
#define CPU_WALLCLOCK 5 /* int: indicates wall CMOS clock */
|
||||
#define CPU_MAXID 6 /* number of valid machdep ids */
|
||||
|
||||
#define CTL_MACHDEP_NAMES { \
|
||||
{ 0, 0 }, \
|
||||
{ "console_device", CTLTYPE_STRUCT }, \
|
||||
{ "adjkerntz", CTLTYPE_INT }, \
|
||||
{ "disable_rtc_set", CTLTYPE_INT }, \
|
||||
{ "bootinfo", CTLTYPE_STRUCT }, \
|
||||
{ "wall_cmos_clock", CTLTYPE_INT }, \
|
||||
}
|
||||
|
||||
#ifdef _KERNEL
|
||||
extern char btext[];
|
||||
extern char etext[];
|
||||
|
@ -51,19 +51,7 @@
|
||||
/*
|
||||
* CTL_MACHDEP definitions.
|
||||
*/
|
||||
#define CPU_CONSDEV 1 /* dev_t: console terminal device */
|
||||
#define CPU_ADJKERNTZ 2 /* int: timezone offset (seconds) */
|
||||
#define CPU_DISRTCSET 3 /* int: disable resettodr() call */
|
||||
#define CPU_WALLCLOCK 4 /* int: indicates wall CMOS clock */
|
||||
#define CPU_MAXID 5 /* valid machdep IDs */
|
||||
|
||||
#define CTL_MACHDEP_NAMES { \
|
||||
{ 0, 0 }, \
|
||||
{ "console_device", CTLTYPE_STRUCT }, \
|
||||
{ "adjkerntz", CTLTYPE_INT }, \
|
||||
{ "disable_rtc_set", CTLTYPE_INT }, \
|
||||
{ "wall_cmos_clock", CTLTYPE_INT }, \
|
||||
}
|
||||
#define OID_AUTO 3 /* int: disable resettodr() call */
|
||||
|
||||
#ifdef _KERNEL
|
||||
|
||||
|
@ -1264,16 +1264,16 @@ sysctl_machdep_adjkerntz(SYSCTL_HANDLER_ARGS)
|
||||
return (error);
|
||||
}
|
||||
|
||||
SYSCTL_PROC(_machdep, CPU_ADJKERNTZ, adjkerntz, CTLTYPE_INT|CTLFLAG_RW,
|
||||
SYSCTL_PROC(_machdep, OID_AUTO, adjkerntz, CTLTYPE_INT|CTLFLAG_RW,
|
||||
&adjkerntz, 0, sysctl_machdep_adjkerntz, "I", "");
|
||||
|
||||
SYSCTL_INT(_machdep, CPU_DISRTCSET, disable_rtc_set,
|
||||
SYSCTL_INT(_machdep, OID_AUTO, disable_rtc_set,
|
||||
CTLFLAG_RW, &disable_rtc_set, 0, "");
|
||||
|
||||
SYSCTL_STRUCT(_machdep, CPU_BOOTINFO, bootinfo,
|
||||
SYSCTL_STRUCT(_machdep, OID_AUTO, bootinfo,
|
||||
CTLFLAG_RD, &bootinfo, bootinfo, "");
|
||||
|
||||
SYSCTL_INT(_machdep, CPU_WALLCLOCK, wall_cmos_clock,
|
||||
SYSCTL_INT(_machdep, OID_AUTO, wall_cmos_clock,
|
||||
CTLFLAG_RW, &wall_cmos_clock, 0, "");
|
||||
|
||||
u_long bootdev; /* not a struct cdev *- encoding is different */
|
||||
|
@ -55,17 +55,6 @@ extern void __syncicache(void *, int);
|
||||
* CTL_MACHDEP definitions.
|
||||
*/
|
||||
#define CPU_CACHELINE 1
|
||||
#define CPU_CONSDEV 2
|
||||
#define CPU_ADJKERNTZ 3
|
||||
#define CPU_DISRTCSET 4
|
||||
#define CPU_BOOTINFO 5
|
||||
#define CPU_WALLCLOCK 6
|
||||
#define CPU_MAXID 7
|
||||
|
||||
#define CTL_MACHDEP_NAMES { \
|
||||
{ 0, 0 }, \
|
||||
{ "cachelinesize", CTLTYPE_INT }, \
|
||||
}
|
||||
|
||||
static __inline u_int64_t
|
||||
get_cyclecount(void)
|
||||
|
@ -47,25 +47,6 @@
|
||||
#define cpu_setstack(td, sp) ((td)->td_frame->tf_sp = (sp))
|
||||
#define cpu_spinwait() /* nothing */
|
||||
|
||||
/*
|
||||
* CTL_MACHDEP definitions.
|
||||
*/
|
||||
#define CPU_CONSDEV 1 /* dev_t: console terminal device */
|
||||
#define CPU_ADJKERNTZ 2 /* int: timezone offset (seconds) */
|
||||
#define CPU_DISRTCSET 3 /* int: disable resettodr() call */
|
||||
#define CPU_BOOTINFO 4 /* struct: bootinfo */
|
||||
#define CPU_WALLCLOCK 5 /* int: indicates wall CMOS clock */
|
||||
#define CPU_MAXID 6 /* number of valid machdep ids */
|
||||
|
||||
#define CTL_MACHDEP_NAMES { \
|
||||
{ 0, 0 }, \
|
||||
{ "console_device", CTLTYPE_STRUCT }, \
|
||||
{ "adjkerntz", CTLTYPE_INT }, \
|
||||
{ "disable_rtc_set", CTLTYPE_INT }, \
|
||||
{ "bootinfo", CTLTYPE_STRUCT }, \
|
||||
{ "wall_cmos_clock", CTLTYPE_INT }, \
|
||||
}
|
||||
|
||||
#ifdef _KERNEL
|
||||
|
||||
extern char btext[];
|
||||
|
Loading…
x
Reference in New Issue
Block a user