From nobody Mon Dec 27 15:48:15 2021 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 934B8191C5F9; Mon, 27 Dec 2021 15:48:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JN2BR2Sw3z4mXX; Mon, 27 Dec 2021 15:48:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 34E2920AD5; Mon, 27 Dec 2021 15:48:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BRFmFJj058339; Mon, 27 Dec 2021 15:48:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BRFmFKa058338; Mon, 27 Dec 2021 15:48:15 GMT (envelope-from git) Date: Mon, 27 Dec 2021 15:48:15 GMT Message-Id: <202112271548.1BRFmFKa058338@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: eb62bd1d3851 - stable/13 - x86: Deduplicate clock.h List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: eb62bd1d38511f1b7414c3e81d6ac508de098660 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640620095; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i6PxoIxtMNRqhySA27qImyW/YF8vniaX+kwZtPc9UX8=; b=edSIvb4B8RQV2tAzdrX/QAMiCsCQkNl3kVtq1gLzjqQDGqYBAbQ+LFRPpM9G+/Z5OA4pbV VjDccAL6BDdAp8FfV8hMxKuD2jcTc8KNZbC9Np6UBQ8mzPKQppDX1QQ+4v7jFpg03k+oFe k6jA8MaFCrewVVC5QSY6apbQcAHtC2vwDOSPkY+p1bAdCXz3plM7OpzxDMSAr2fMzasZ0U JRTVgCRJFSnUNhOIf3dbPAEKJevrHrsYEh++sbOS019swh6/JgJJUFU82UT2JzvyNiQZJZ 7zyhrBicH9h4vPLvJfPVqfcNaOmnNg8baANsqfpZg4mgY0+OP2WyTbU77iaWjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640620095; a=rsa-sha256; cv=none; b=cQQkQB7agGG25lqZK3AnNEfjSOkoQRtZRkkoqsAxhaZ/qKyqYkIzNreRB1JVNQmQ+HCrWe W7IJyvdldjCl6iZ8Yc0VFfeU+IVj7S4vZ8P+byzPUI86zaYVnR29S939asAEVP0tOJuX9b BP399HaZEphvdxSo/2zYD6pDJYA+LVXysnRwx7qcdi9zrVe6zfY/H/sHTzDayeB5+ah5e0 FsTxxgaS6qXkKGC3LQNxKpvmyECigvOhDNffbbYtNkbQ1J+MyVLpYrwo3hl4gh5FaRdNyi yaiDsxzkq6hYLZNiAAC3JPwQ2cjbem06p6jFq/K7VSjnnStS3gEC7hkTxNgu4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=eb62bd1d38511f1b7414c3e81d6ac508de098660 commit eb62bd1d38511f1b7414c3e81d6ac508de098660 Author: Mark Johnston AuthorDate: 2021-12-06 15:39:08 +0000 Commit: Mark Johnston CommitDate: 2021-12-27 15:48:00 +0000 x86: Deduplicate clock.h The headers were mostly identical on amd64 and i386. No functional change intended. Reviewed by: cperciva, mav, imp, kib, jhb Sponsored by: The FreeBSD Foundation (cherry picked from commit f06f1d1fdb969fa7a0a6eefa030d8536f365eb6e) --- sys/amd64/include/clock.h | 45 ++------------------------------------------- sys/i386/include/clock.h | 42 ++---------------------------------------- sys/x86/include/clock.h | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 83 deletions(-) diff --git a/sys/amd64/include/clock.h b/sys/amd64/include/clock.h index 86a4541568ed..57233651aef3 100644 --- a/sys/amd64/include/clock.h +++ b/sys/amd64/include/clock.h @@ -1,46 +1,5 @@ -/*- - * Kernel interface to machine-dependent clock driver. - * Garrett Wollman, September 1994. - * This file is in the public domain. - * - * $FreeBSD$ - */ - -#ifndef _MACHINE_CLOCK_H_ -#define _MACHINE_CLOCK_H_ - -#ifdef _KERNEL -/* - * i386 to clock driver interface. - * XXX large parts of the driver and its interface are misplaced. - */ -extern int clkintr_pending; -extern u_int i8254_freq; -extern int i8254_max_count; -extern uint64_t tsc_freq; -extern int tsc_is_invariant; -extern int tsc_perf_stat; -#ifdef SMP -extern int smp_tsc; -#endif - -void i8254_init(void); -void i8254_delay(int); -void clock_init(void); - /* - * Driver to clock driver interface. + * This file is in the public domain. */ -void startrtclock(void); -void init_TSC(void); -void resume_TSC(void); - -#define HAS_TIMER_SPKR 1 -int timer_spkr_acquire(void); -int timer_spkr_release(void); -void timer_spkr_setfreq(int freq); - -#endif /* _KERNEL */ - -#endif /* !_MACHINE_CLOCK_H_ */ +#include diff --git a/sys/i386/include/clock.h b/sys/i386/include/clock.h index 6f335bf05cfa..57233651aef3 100644 --- a/sys/i386/include/clock.h +++ b/sys/i386/include/clock.h @@ -1,43 +1,5 @@ -/*- - * Kernel interface to machine-dependent clock driver. - * Garrett Wollman, September 1994. - * This file is in the public domain. - * - * $FreeBSD$ - */ - -#ifndef _MACHINE_CLOCK_H_ -#define _MACHINE_CLOCK_H_ - -#ifdef _KERNEL -/* - * i386 to clock driver interface. - * XXX large parts of the driver and its interface are misplaced. - */ -extern int clkintr_pending; -extern u_int i8254_freq; -extern int i8254_max_count; -extern uint64_t tsc_freq; -extern int tsc_is_invariant; -extern int tsc_perf_stat; - -void i8254_init(void); -void i8254_delay(int); -void clock_init(void); - /* - * Driver to clock driver interface. + * This file is in the public domain. */ -void startrtclock(void); -void init_TSC(void); -void resume_TSC(void); - -#define HAS_TIMER_SPKR 1 -int timer_spkr_acquire(void); -int timer_spkr_release(void); -void timer_spkr_setfreq(int freq); - -#endif /* _KERNEL */ - -#endif /* !_MACHINE_CLOCK_H_ */ +#include diff --git a/sys/x86/include/clock.h b/sys/x86/include/clock.h new file mode 100644 index 000000000000..86a4541568ed --- /dev/null +++ b/sys/x86/include/clock.h @@ -0,0 +1,46 @@ +/*- + * Kernel interface to machine-dependent clock driver. + * Garrett Wollman, September 1994. + * This file is in the public domain. + * + * $FreeBSD$ + */ + +#ifndef _MACHINE_CLOCK_H_ +#define _MACHINE_CLOCK_H_ + +#ifdef _KERNEL +/* + * i386 to clock driver interface. + * XXX large parts of the driver and its interface are misplaced. + */ +extern int clkintr_pending; +extern u_int i8254_freq; +extern int i8254_max_count; +extern uint64_t tsc_freq; +extern int tsc_is_invariant; +extern int tsc_perf_stat; +#ifdef SMP +extern int smp_tsc; +#endif + +void i8254_init(void); +void i8254_delay(int); +void clock_init(void); + +/* + * Driver to clock driver interface. + */ + +void startrtclock(void); +void init_TSC(void); +void resume_TSC(void); + +#define HAS_TIMER_SPKR 1 +int timer_spkr_acquire(void); +int timer_spkr_release(void); +void timer_spkr_setfreq(int freq); + +#endif /* _KERNEL */ + +#endif /* !_MACHINE_CLOCK_H_ */