On Sat, Jul 01, 2023 at 08:35:47PM -0500, Scott Cheloha wrote:
> Every platform made the clockintr switch six months ago or more. The
> __HAVE_CLOCKINTR symbol is now redundant and can be removed.
>
> ok?
>
makes sense if every platform defines it all the time.
> Index: ./ddb/db_command.c
> ===================================================================
> RCS file: /cvs/src/sys/ddb/db_command.c,v
> retrieving revision 1.98
> diff -u -p -r1.98 db_command.c
> --- ./ddb/db_command.c 8 Mar 2023 04:43:07 -0000 1.98
> +++ ./ddb/db_command.c 2 Jul 2023 01:34:00 -0000
> @@ -579,9 +579,7 @@ db_bcstats_print_cmd(db_expr_t addr, int
> const struct db_command db_show_all_cmds[] = {
> { "procs", db_show_all_procs, 0, NULL },
> { "callout", db_show_callout, 0, NULL },
> -#ifdef __HAVE_CLOCKINTR
> { "clockintr", db_show_all_clockintr, 0, NULL },
> -#endif
> { "pools", db_show_all_pools, 0, NULL },
> { "mounts", db_show_all_mounts, 0, NULL },
> { "vnodes", db_show_all_vnodes, 0, NULL },
> Index: ./ddb/db_interface.h
> ===================================================================
> RCS file: /cvs/src/sys/ddb/db_interface.h,v
> retrieving revision 1.25
> diff -u -p -r1.25 db_interface.h
> --- ./ddb/db_interface.h 5 Nov 2022 19:29:45 -0000 1.25
> +++ ./ddb/db_interface.h 2 Jul 2023 01:34:00 -0000
> @@ -44,9 +44,7 @@ void db_kill_cmd(db_expr_t, int, db_expr
> void db_show_all_procs(db_expr_t, int, db_expr_t, char *);
>
> /* kern/kern_clockintr.c */
> -#ifdef __HAVE_CLOCKINTR
> void db_show_all_clockintr(db_expr_t, int, db_expr_t, char *);
> -#endif
>
> /* kern/kern_timeout.c */
> void db_show_callout(db_expr_t, int, db_expr_t, char *);
> Index: ./kern/kern_clockintr.c
> ===================================================================
> RCS file: /cvs/src/sys/kern/kern_clockintr.c,v
> retrieving revision 1.26
> diff -u -p -r1.26 kern_clockintr.c
> --- ./kern/kern_clockintr.c 2 Jul 2023 00:55:18 -0000 1.26
> +++ ./kern/kern_clockintr.c 2 Jul 2023 01:34:00 -0000
> @@ -29,8 +29,6 @@
> #include <sys/sysctl.h>
> #include <sys/time.h>
>
> -#ifdef __HAVE_CLOCKINTR
> -
> /*
> * Protection for global variables in this file:
> *
> @@ -773,4 +771,3 @@ db_show_clockintr(const struct clockintr
> }
>
> #endif /* DDB */
> -#endif /*__HAVE_CLOCKINTR */
> Index: ./kern/kern_sysctl.c
> ===================================================================
> RCS file: /cvs/src/sys/kern/kern_sysctl.c,v
> retrieving revision 1.415
> diff -u -p -r1.415 kern_sysctl.c
> --- ./kern/kern_sysctl.c 21 May 2023 12:47:54 -0000 1.415
> +++ ./kern/kern_sysctl.c 2 Jul 2023 01:34:00 -0000
> @@ -430,11 +430,9 @@ kern_sysctl_dirs(int top_name, int *name
> case KERN_CPUSTATS:
> return (sysctl_cpustats(name, namelen, oldp, oldlenp,
> newp, newlen));
> -#ifdef __HAVE_CLOCKINTR
> case KERN_CLOCKINTR:
> return sysctl_clockintr(name, namelen, oldp, oldlenp, newp,
> newlen);
> -#endif
> default:
> return (ENOTDIR); /* overloaded */
> }
> Index: ./kern/subr_suspend.c
> ===================================================================
> RCS file: /cvs/src/sys/kern/subr_suspend.c,v
> retrieving revision 1.14
> diff -u -p -r1.14 subr_suspend.c
> --- ./kern/subr_suspend.c 10 Nov 2022 10:37:40 -0000 1.14
> +++ ./kern/subr_suspend.c 2 Jul 2023 01:34:00 -0000
> @@ -165,10 +165,9 @@ fail_suspend:
> splx(s);
>
> inittodr(gettime());
> -#ifdef __HAVE_CLOCKINTR
> clockintr_cpu_init(NULL);
> clockintr_trigger();
> -#endif
> +
> sleep_resume(v);
> resume_randomness(rndbuf, rndbuflen);
> #ifdef MULTIPROCESSOR
> Index: ./arch/alpha/include/_types.h
> ===================================================================
> RCS file: /cvs/src/sys/arch/alpha/include/_types.h,v
> retrieving revision 1.25
> diff -u -p -r1.25 _types.h
> --- ./arch/alpha/include/_types.h 10 Dec 2022 15:02:29 -0000 1.25
> +++ ./arch/alpha/include/_types.h 2 Jul 2023 01:34:00 -0000
> @@ -35,8 +35,6 @@
> #ifndef _MACHINE__TYPES_H_
> #define _MACHINE__TYPES_H_
>
> -#define __HAVE_CLOCKINTR
> -
> #if defined(_KERNEL)
> typedef struct label_t {
> long val[10];
> Index: ./arch/amd64/include/_types.h
> ===================================================================
> RCS file: /cvs/src/sys/arch/amd64/include/_types.h,v
> retrieving revision 1.18
> diff -u -p -r1.18 _types.h
> --- ./arch/amd64/include/_types.h 8 Nov 2022 17:34:13 -0000 1.18
> +++ ./arch/amd64/include/_types.h 2 Jul 2023 01:34:00 -0000
> @@ -35,8 +35,6 @@
> #ifndef _MACHINE__TYPES_H_
> #define _MACHINE__TYPES_H_
>
> -#define __HAVE_CLOCKINTR
> -
> /*
> * _ALIGN(p) rounds p (pointer or byte index) up to a correctly-aligned
> * value for all data types (int, long, ...). The result is an
> Index: ./arch/arm/include/_types.h
> ===================================================================
> RCS file: /cvs/src/sys/arch/arm/include/_types.h,v
> retrieving revision 1.20
> diff -u -p -r1.20 _types.h
> --- ./arch/arm/include/_types.h 17 Jan 2023 02:27:14 -0000 1.20
> +++ ./arch/arm/include/_types.h 2 Jul 2023 01:34:00 -0000
> @@ -35,8 +35,6 @@
> #ifndef _ARM__TYPES_H_
> #define _ARM__TYPES_H_
>
> -#define __HAVE_CLOCKINTR
> -
> #if defined(_KERNEL)
> typedef struct label_t {
> long val[11];
> Index: ./arch/arm64/include/_types.h
> ===================================================================
> RCS file: /cvs/src/sys/arch/arm64/include/_types.h,v
> retrieving revision 1.5
> diff -u -p -r1.5 _types.h
> --- ./arch/arm64/include/_types.h 8 Nov 2022 17:56:38 -0000 1.5
> +++ ./arch/arm64/include/_types.h 2 Jul 2023 01:34:00 -0000
> @@ -34,8 +34,6 @@
> #ifndef _MACHINE__TYPES_H_
> #define _MACHINE__TYPES_H_
>
> -#define __HAVE_CLOCKINTR
> -
> #if defined(_KERNEL)
> typedef struct label_t {
> long val[13];
> Index: ./arch/hppa/include/_types.h
> ===================================================================
> RCS file: /cvs/src/sys/arch/hppa/include/_types.h,v
> retrieving revision 1.27
> diff -u -p -r1.27 _types.h
> --- ./arch/hppa/include/_types.h 6 Dec 2022 00:40:09 -0000 1.27
> +++ ./arch/hppa/include/_types.h 2 Jul 2023 01:34:00 -0000
> @@ -35,8 +35,6 @@
> #ifndef _MACHINE__TYPES_H_
> #define _MACHINE__TYPES_H_
>
> -#define __HAVE_CLOCKINTR
> -
> #if defined(_KERNEL)
> typedef struct label_t {
> long val[19];
> Index: ./arch/i386/i386/apm.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/i386/i386/apm.c,v
> retrieving revision 1.131
> diff -u -p -r1.131 apm.c
> --- ./arch/i386/i386/apm.c 22 Jun 2023 13:18:02 -0000 1.131
> +++ ./arch/i386/i386/apm.c 2 Jul 2023 01:34:00 -0000
> @@ -265,10 +265,8 @@ apm_suspend(int state)
> rtcstart(); /* in i8254 mode, rtc is profclock */
> inittodr(gettime());
>
> -#ifdef __HAVE_CLOCKINTR
> clockintr_cpu_init(NULL);
> clockintr_trigger();
> -#endif
>
> config_suspend_all(DVACT_RESUME);
> cold = 0;
> Index: ./arch/i386/include/_types.h
> ===================================================================
> RCS file: /cvs/src/sys/arch/i386/include/_types.h,v
> retrieving revision 1.24
> diff -u -p -r1.24 _types.h
> --- ./arch/i386/include/_types.h 6 Dec 2022 01:56:44 -0000 1.24
> +++ ./arch/i386/include/_types.h 2 Jul 2023 01:34:00 -0000
> @@ -35,8 +35,6 @@
> #ifndef _MACHINE__TYPES_H_
> #define _MACHINE__TYPES_H_
>
> -#define __HAVE_CLOCKINTR
> -
> /*
> * _ALIGN(p) rounds p (pointer or byte index) up to a correctly-aligned
> * value for all data types (int, long, ...). The result is an
> Index: ./arch/loongson/dev/apm.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/loongson/dev/apm.c,v
> retrieving revision 1.42
> diff -u -p -r1.42 apm.c
> --- ./arch/loongson/dev/apm.c 10 Feb 2023 14:34:16 -0000 1.42
> +++ ./arch/loongson/dev/apm.c 2 Jul 2023 01:34:01 -0000
> @@ -418,10 +418,8 @@ apm_suspend(int state)
> }
>
> inittodr(gettime()); /* Move the clock forward */
> -#ifdef __HAVE_CLOCKINTR
> clockintr_cpu_init(NULL);
> clockintr_trigger();
> -#endif
>
> config_suspend_all(DVACT_RESUME);
>
> Index: ./arch/m88k/include/_types.h
> ===================================================================
> RCS file: /cvs/src/sys/arch/m88k/include/_types.h,v
> retrieving revision 1.19
> diff -u -p -r1.19 _types.h
> --- ./arch/m88k/include/_types.h 6 Dec 2022 00:56:52 -0000 1.19
> +++ ./arch/m88k/include/_types.h 2 Jul 2023 01:34:01 -0000
> @@ -35,8 +35,6 @@
> #ifndef _M88K__TYPES_H_
> #define _M88K__TYPES_H_
>
> -#define __HAVE_CLOCKINTR
> -
> #if defined(_KERNEL)
> typedef struct label_t {
> long val[19];
> Index: ./arch/mips64/include/_types.h
> ===================================================================
> RCS file: /cvs/src/sys/arch/mips64/include/_types.h,v
> retrieving revision 1.24
> diff -u -p -r1.24 _types.h
> --- ./arch/mips64/include/_types.h 19 Nov 2022 16:23:48 -0000 1.24
> +++ ./arch/mips64/include/_types.h 2 Jul 2023 01:34:01 -0000
> @@ -35,8 +35,6 @@
> #ifndef _MIPS64__TYPES_H_
> #define _MIPS64__TYPES_H_
>
> -#define __HAVE_CLOCKINTR
> -
> /*
> * _ALIGN(p) rounds p (pointer or byte index) up to a correctly-aligned
> * value for all data types (int, long, ...). The result is an
> Index: ./arch/powerpc/include/_types.h
> ===================================================================
> RCS file: /cvs/src/sys/arch/powerpc/include/_types.h,v
> retrieving revision 1.24
> diff -u -p -r1.24 _types.h
> --- ./arch/powerpc/include/_types.h 29 Nov 2022 00:58:05 -0000 1.24
> +++ ./arch/powerpc/include/_types.h 2 Jul 2023 01:34:01 -0000
> @@ -35,8 +35,6 @@
> #ifndef _POWERPC__TYPES_H_
> #define _POWERPC__TYPES_H_
>
> -#define __HAVE_CLOCKINTR
> -
> #if defined(_KERNEL)
> typedef struct label_t {
> long val[25];
> Index: ./arch/powerpc64/include/_types.h
> ===================================================================
> RCS file: /cvs/src/sys/arch/powerpc64/include/_types.h,v
> retrieving revision 1.3
> diff -u -p -r1.3 _types.h
> --- ./arch/powerpc64/include/_types.h 29 Nov 2022 01:04:44 -0000 1.3
> +++ ./arch/powerpc64/include/_types.h 2 Jul 2023 01:34:01 -0000
> @@ -34,8 +34,6 @@
> #ifndef _MACHINE__TYPES_H_
> #define _MACHINE__TYPES_H_
>
> -#define __HAVE_CLOCKINTR
> -
> #if defined(_KERNEL)
> typedef struct label_t {
> long val[22];
> Index: ./arch/riscv64/include/_types.h
> ===================================================================
> RCS file: /cvs/src/sys/arch/riscv64/include/_types.h,v
> retrieving revision 1.4
> diff -u -p -r1.4 _types.h
> --- ./arch/riscv64/include/_types.h 19 Nov 2022 16:02:37 -0000 1.4
> +++ ./arch/riscv64/include/_types.h 2 Jul 2023 01:34:01 -0000
> @@ -35,8 +35,6 @@
> #ifndef _MACHINE__TYPES_H_
> #define _MACHINE__TYPES_H_
>
> -#define __HAVE_CLOCKINTR
> -
> #if defined(_KERNEL)
> typedef struct label_t {
> long val[14];
> Index: ./arch/sh/include/_types.h
> ===================================================================
> RCS file: /cvs/src/sys/arch/sh/include/_types.h,v
> retrieving revision 1.21
> diff -u -p -r1.21 _types.h
> --- ./arch/sh/include/_types.h 6 Dec 2022 01:19:35 -0000 1.21
> +++ ./arch/sh/include/_types.h 2 Jul 2023 01:34:01 -0000
> @@ -35,8 +35,6 @@
> #ifndef _SH__TYPES_H_
> #define _SH__TYPES_H_
>
> -#define __HAVE_CLOCKINTR
> -
> #if defined(_KERNEL)
> typedef struct label_t {
> long val[9];
> Index: ./arch/sparc64/include/_types.h
> ===================================================================
> RCS file: /cvs/src/sys/arch/sparc64/include/_types.h,v
> retrieving revision 1.24
> diff -u -p -r1.24 _types.h
> --- ./arch/sparc64/include/_types.h 13 Jan 2023 03:22:18 -0000 1.24
> +++ ./arch/sparc64/include/_types.h 2 Jul 2023 01:34:01 -0000
> @@ -35,8 +35,6 @@
> #ifndef _MACHINE__TYPES_H_
> #define _MACHINE__TYPES_H_
>
> -#define __HAVE_CLOCKINTR
> -
> #if defined(_KERNEL)
> typedef struct label_t {
> long val[2];
>
