From nobody Wed Oct 22 14:07:41 2025 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 4cs9wZ1MdDz6FL5L; Wed, 22 Oct 2025 14:07:42 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cs9wZ0njjz43vv; Wed, 22 Oct 2025 14:07:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761142062; 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=eUkP0w0axsrpOqF5DpgQge/N00anl9Wv7epoLO7doeE=; b=u6p8V2qVJZx7F6UzYjfU6RZGC7FuaezSEPUuQ4gx88rUWcEII76oFe4ISjkgSWjMOj+NUX mXaZhD2qaNPnsthg8H/LFvxbHpRtVVq6hqd2EI9yh1bszyySeff/pMQcqbXxZdqQGxU8Mv vJgiNpJlCbyf1UOwWg0Oz00ifjbADLwhbW14oLYsD+HEhy244/ygCOnONzKsNFbzZf+GlZ uFCswnXFgnFPT4IVX0nhB37DGJm0ksE99Qk1dQ72jqTRWr7t9TQdRxYrumx+u+rEUvQAi8 X0lgBPD+ohuBCpbBZ/3aw48pJRBO9nltm2QZNht/g35o6G2b9rPx3FDqLsh6Ow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761142062; 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=eUkP0w0axsrpOqF5DpgQge/N00anl9Wv7epoLO7doeE=; b=IEWhYBxwDLDx5edWS1Rc8sI4RIHhIKQf1J5+MWqHB3o7LMO0ftwCRP8vgmLxSf6u2W1Uoe 3DM38rXFP3JCRqPFb30TA/0vLsJnDOSR1JTz4U9nU3ONjS55pQRXZNFiATLrExN1WaXre/ BjW37dGL92+rZ5dRWNaq3QsEWwoZicn3HkIRQBkqxRdO6fytzcxsKVn1/fjH662RV3pO2S pbwsHYIUQES3U6snlp/rKRrIK5gbOjcwfEn7XhoN99pc2PvVyCn2f71qhE4NgS/E0dzCuE /4UsNjJwFkCuFU4BSCbrZsNnRfl2q5oPoScCyNgqj7TMiVuWigFyPJwFeRGjzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761142062; a=rsa-sha256; cv=none; b=xAHsQMVhN9o2yv2A7i2Ogrk7zyq3LzVlcHcfOHsndlhApoiIKHQSB2nhhcsqOZX8Aiygi6 SbOOOVY0hSedcMkW8PX+rT655GYKR+Y0LdOsVPjYjDRUSnN+T+y5EjonQ2mGcc+CtCilhp d3NucagcXiSt0bYDniqsP4CmnZOXnkVP1TDa6yHdNqQahlypT2R41rU4y2ldF4dBd4HwOI r8mHh7bpQrwm5cfX4SRP+vyuD0e/Rvou1iGqP0fABCJ1zx5kVSmSokrHEIfbg3wEgqmdou A83Yz7hvx9kUHU1TBsuF+Kefc/LIJBh3SNxe+egrwTD509rwQ4HxiZsz27WaCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cs9wZ0ML7zYMV; Wed, 22 Oct 2025 14:07:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59ME7fcX032998; Wed, 22 Oct 2025 14:07:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59ME7fDa032995; Wed, 22 Oct 2025 14:07:41 GMT (envelope-from git) Date: Wed, 22 Oct 2025 14:07:41 GMT Message-Id: <202510221407.59ME7fDa032995@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 3e9ad70a30d9 - main - linuxkpi: Fix the definition of BITS_PER_LONG 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/main X-Git-Reftype: branch X-Git-Commit: 3e9ad70a30d93fc8bc759af7ec57aaa7e0b2d4f6 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3e9ad70a30d93fc8bc759af7ec57aaa7e0b2d4f6 commit 3e9ad70a30d93fc8bc759af7ec57aaa7e0b2d4f6 Author: Mark Johnston AuthorDate: 2025-10-22 14:04:46 +0000 Commit: Mark Johnston CommitDate: 2025-10-22 14:04:46 +0000 linuxkpi: Fix the definition of BITS_PER_LONG Don't use __LP64__ to decide the value, as it gives the wrong result on CHERI platforms. Just define it in terms of __SIZEOF_LONG__. Make a similar adjustment for BITS_PER_LONG_LONG while here. Reviewed by: bz, dumbbell, emaste MFC after: 1 week Sponsored by: CHERI Research Centre (EPSRC grant UKRI3001) Differential Revision: https://reviews.freebsd.org/D53135 --- sys/compat/linuxkpi/common/include/linux/bitops.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/bitops.h b/sys/compat/linuxkpi/common/include/linux/bitops.h index 00dd1f9a1ec0..a5a7abd55287 100644 --- a/sys/compat/linuxkpi/common/include/linux/bitops.h +++ b/sys/compat/linuxkpi/common/include/linux/bitops.h @@ -37,13 +37,8 @@ #define BIT(nr) (1UL << (nr)) #define BIT_ULL(nr) (1ULL << (nr)) -#ifdef __LP64__ -#define BITS_PER_LONG 64 -#else -#define BITS_PER_LONG 32 -#endif - -#define BITS_PER_LONG_LONG 64 +#define BITS_PER_LONG (__SIZEOF_LONG__ * __CHAR_BIT__) +#define BITS_PER_LONG_LONG (__SIZEOF_LONG_LONG__ * __CHAR_BIT__) #define BITMAP_FIRST_WORD_MASK(start) (~0UL << ((start) % BITS_PER_LONG)) #define BITMAP_LAST_WORD_MASK(n) (~0UL >> (BITS_PER_LONG - (n)))