Date: Sun, 19 Jul 2026 14:42:47 +0100 From: Jessica Clarke <jrtc27@freebsd.org> To: ShengYi Hung <aokblast@FreeBSD.org> Cc: "src-committers@freebsd.org" <src-committers@FreeBSD.org>, "dev-commits-src-all@freebsd.org" <dev-commits-src-all@FreeBSD.org>, "dev-commits-src-main@freebsd.org" <dev-commits-src-main@FreeBSD.org>, Harry Schmalzb <freebsd@omnilan.de> Subject: Re: git: bdc0f7678257 - main - hwpstate_intel: Fix i386 build Message-ID: <8A47C3A1-E9FD-45D4-9547-3624CF482445@freebsd.org> In-Reply-To: <B6129E16-9F82-4252-A8F1-C447DF0CC177@freebsd.org> References: <6a5cd2fb.3bcc6.f82cb9f@gitrepo.freebsd.org> <B6129E16-9F82-4252-A8F1-C447DF0CC177@freebsd.org>
index | next in thread | previous in thread | raw e-mail
On 19 Jul 2026, at 14:40, Jessica Clarke <jrtc27@freebsd.org> wrote: > > On 19 Jul 2026, at 14:36, ShengYi Hung <aokblast@FreeBSD.org> wrote: >> >> The branch main has been updated by aokblast: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=bdc0f7678257eaa739b9c816285504470e71e3de >> >> commit bdc0f7678257eaa739b9c816285504470e71e3de >> Author: Harry Schmalzb <freebsd@omnilan.de> >> AuthorDate: 2026-07-13 05:29:34 +0000 >> Commit: ShengYi Hung <aokblast@FreeBSD.org> >> CommitDate: 2026-07-19 13:36:00 +0000 >> >> hwpstate_intel: Fix i386 build >> >> Reviewed by: olce >> Fixes: 7b26353a59d6 >> MFC after: 3 days >> Sponsored by: The FreeBSD Foundation >> Differential Revision: https://reviews.freebsd.org/D58208 >> --- >> sys/x86/cpufreq/hwpstate_intel.c | 8 ++++++++ >> 1 file changed, 8 insertions(+) >> >> diff --git a/sys/x86/cpufreq/hwpstate_intel.c b/sys/x86/cpufreq/hwpstate_intel.c >> index 59d7a155fda8..56a33fa88e66 100644 >> --- a/sys/x86/cpufreq/hwpstate_intel.c >> +++ b/sys/x86/cpufreq/hwpstate_intel.c >> @@ -352,13 +352,19 @@ intel_hwpstate_hybrid_cb(void *ctx) >> { >> uint32_t *small_cores = ctx; >> >> +#ifdef __i386__ >> + (void)small_cores; >> +#else >> atomic_add_32(small_cores, PCPU_GET(small_core)); >> +#endif >> } > > Hi, > The whole point of my suggestion was that this would be the only part > of the diff needed. By stubbing out the function, small_cores is never > incremented, and so the code ifndef’ed out below is dead without the > need for as many ifndefs. (And if that doesn’t work then you should go back to your original diff. But this version here is the worst of both worlds, since now intel_hwpstate_hybrid_cb is an unused static function, I believe.)home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?8A47C3A1-E9FD-45D4-9547-3624CF482445>