From: Hans-Christian Noren Egtvedt <hegtvedt@cisco.com>
To: linux-kernel@vger.kernel.org
Cc: gregkh@linuxfoundation.org,
Christian Borntraeger <borntraeger@de.ibm.com>,
Yury Norov <yury.norov@gmail.com>,
Allison Randal <allison@lohutok.net>,
Joe Perches <joe@perches.com>,
Thomas Gleixner <tglx@linutronix.de>,
William Breathitt Gray <vilhelm.gray@gmail.com>,
Torsten Hilbrich <torsten.hilbrich@secunet.com>,
Andrew Morton <akpm@linux-foundation.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Hans-Christian Noren Egtvedt <hegtvedt@cisco.com>
Subject: [v4.9 PATCH v2 1/6] include/uapi/linux/swab.h: fix userspace breakage, use __BITS_PER_LONG for swap
Date: Mon, 1 Aug 2022 18:43:23 +0200 [thread overview]
Message-ID: <20220801164328.2205839-1-hegtvedt@cisco.com> (raw)
From: Christian Borntraeger <borntraeger@de.ibm.com>
QEMU has a funny new build error message when I use the upstream kernel
headers:
CC block/file-posix.o
In file included from /home/cborntra/REPOS/qemu/include/qemu/timer.h:4,
from /home/cborntra/REPOS/qemu/include/qemu/timed-average.h:29,
from /home/cborntra/REPOS/qemu/include/block/accounting.h:28,
from /home/cborntra/REPOS/qemu/include/block/block_int.h:27,
from /home/cborntra/REPOS/qemu/block/file-posix.c:30:
/usr/include/linux/swab.h: In function `__swab':
/home/cborntra/REPOS/qemu/include/qemu/bitops.h:20:34: error: "sizeof" is not defined, evaluates to 0 [-Werror=undef]
20 | #define BITS_PER_LONG (sizeof (unsigned long) * BITS_PER_BYTE)
| ^~~~~~
/home/cborntra/REPOS/qemu/include/qemu/bitops.h:20:41: error: missing binary operator before token "("
20 | #define BITS_PER_LONG (sizeof (unsigned long) * BITS_PER_BYTE)
| ^
cc1: all warnings being treated as errors
make: *** [/home/cborntra/REPOS/qemu/rules.mak:69: block/file-posix.o] Error 1
rm tests/qemu-iotests/socket_scm_helper.o
This was triggered by commit d5767057c9a ("uapi: rename ext2_swab() to
swab() and share globally in swab.h"). That patch is doing
#include <asm/bitsperlong.h>
but it uses BITS_PER_LONG.
The kernel file asm/bitsperlong.h provide only __BITS_PER_LONG.
Let us use the __ variant in swap.h
Link: http://lkml.kernel.org/r/20200213142147.17604-1-borntraeger@de.ibm.com
Fixes: d5767057c9a ("uapi: rename ext2_swab() to swab() and share globally in swab.h")
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Yury Norov <yury.norov@gmail.com>
Cc: Allison Randal <allison@lohutok.net>
Cc: Joe Perches <joe@perches.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: William Breathitt Gray <vilhelm.gray@gmail.com>
Cc: Torsten Hilbrich <torsten.hilbrich@secunet.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit 467d12f5c7842896d2de3ced74e4147ee29e97c8)
Signed-off-by: Hans-Christian Noren Egtvedt <hegtvedt@cisco.com>
---
include/uapi/linux/swab.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h
index 1f42d110987..51502eabdb0 100644
--- a/include/uapi/linux/swab.h
+++ b/include/uapi/linux/swab.h
@@ -134,9 +134,9 @@ static inline __attribute_const__ __u32 __fswahb32(__u32 val)
static __always_inline unsigned long __swab(const unsigned long y)
{
-#if BITS_PER_LONG == 64
+#if __BITS_PER_LONG == 64
return __swab64(y);
-#else /* BITS_PER_LONG == 32 */
+#else /* __BITS_PER_LONG == 32 */
return __swab32(y);
#endif
}
--
2.34.1
next reply other threads:[~2022-08-01 16:43 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-01 16:43 Hans-Christian Noren Egtvedt [this message]
2022-08-01 16:43 ` [v4.9 PATCH v2 2/6] init/main: Fix double "the" in comment Hans-Christian Noren Egtvedt
2022-08-01 16:43 ` [v4.9 PATCH v2 3/6] init/main: properly align the multi-line comment Hans-Christian Noren Egtvedt
2022-08-01 16:43 ` [v4.9 PATCH v2 4/6] init: move stack canary initialization after setup_arch Hans-Christian Noren Egtvedt
2022-08-01 16:43 ` [v4.9 PATCH v2 5/6] init/main.c: extract early boot entropy from the passed cmdline Hans-Christian Noren Egtvedt
2022-08-01 16:43 ` [v4.9 PATCH v2 6/6] random: move rand_initialize() earlier Hans-Christian Noren Egtvedt
2022-08-03 12:07 ` Greg KH
2022-08-03 14:01 ` [v4.9 PATCH v3 6/6] random: only call boot_init_stack_canary() once Hans-Christian Noren Egtvedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220801164328.2205839-1-hegtvedt@cisco.com \
--to=hegtvedt@cisco.com \
--cc=akpm@linux-foundation.org \
--cc=allison@lohutok.net \
--cc=borntraeger@de.ibm.com \
--cc=gregkh@linuxfoundation.org \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=torsten.hilbrich@secunet.com \
--cc=torvalds@linux-foundation.org \
--cc=vilhelm.gray@gmail.com \
--cc=yury.norov@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).