Skip to contentSkip to conversation

include/uapi/linux/swab.h: fix userspace breakage, use __BITS_PER_LONG for swap

PATCH New [email protected] 1 participant 1 message Feb 21, 2020 Memory management

lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

PATCH 5/15 include/uapi/linux/swab.h: fix userspace breakage, use __BITS_PER_LONG for swap

From: Christian Borntraeger <[email protected]>
Subject: include/uapi/linux/swab.h: fix userspace breakage, use __BITS_PER_LONG for swap

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") This 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

Fixes d5767057c9a ("uapi: rename ext2_swab() to swab() and share globally in swab.h")
Cc Yury Norov <[email protected]>
Cc Allison Randal <[email protected]>
Cc Joe Perches <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc William Breathitt Gray <[email protected]>
Cc Torsten Hilbrich <[email protected]>

---

 include/uapi/linux/swab.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
include/uapi/linux/swab.h renamed from include/uapi/linux/swab.h~uapi-fix-userspace-breakage-use-__bits_per_long-for-swap +2 -2
@@ -135,9 +135,9 @@ static inline __attribute_const__ __u32
 
 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
 }

_