Revision 467d12f5c7842896d2de3ced74e4147ee29e97c8 authored by Christian Borntraeger on 21 February 2020, 04:04:03 UTC, committed by Linus Torvalds on 21 February 2020, 19:22:15 UTC
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>
1 parent edf28f4
File | Mode | Size |
---|---|---|
lxdialog | ||
tests | ||
.gitignore | -rw-r--r-- | 97 bytes |
Makefile | -rw-r--r-- | 7.4 KB |
conf.c | -rw-r--r-- | 15.7 KB |
confdata.c | -rw-r--r-- | 27.2 KB |
expr.c | -rw-r--r-- | 30.0 KB |
expr.h | -rw-r--r-- | 9.6 KB |
gconf-cfg.sh | -rwxr-xr-x | 733 bytes |
gconf.c | -rw-r--r-- | 38.1 KB |
gconf.glade | -rw-r--r-- | 25.0 KB |
images.c | -rw-r--r-- | 6.3 KB |
images.h | -rw-r--r-- | 752 bytes |
lexer.l | -rw-r--r-- | 9.1 KB |
list.h | -rw-r--r-- | 3.7 KB |
lkc.h | -rw-r--r-- | 3.8 KB |
lkc_proto.h | -rw-r--r-- | 2.4 KB |
mconf-cfg.sh | -rwxr-xr-x | 1.2 KB |
mconf.c | -rw-r--r-- | 27.3 KB |
menu.c | -rw-r--r-- | 22.2 KB |
merge_config.sh | -rwxr-xr-x | 4.6 KB |
nconf-cfg.sh | -rwxr-xr-x | 1.3 KB |
nconf.c | -rw-r--r-- | 38.2 KB |
nconf.gui.c | -rw-r--r-- | 14.8 KB |
nconf.h | -rw-r--r-- | 1.8 KB |
parser.y | -rw-r--r-- | 15.1 KB |
preprocess.c | -rw-r--r-- | 11.0 KB |
qconf-cfg.sh | -rwxr-xr-x | 846 bytes |
qconf.cc | -rw-r--r-- | 44.2 KB |
qconf.h | -rw-r--r-- | 7.4 KB |
streamline_config.pl | -rwxr-xr-x | 16.1 KB |
symbol.c | -rw-r--r-- | 28.6 KB |
util.c | -rw-r--r-- | 2.2 KB |
Computing file changes ...