From: Greg Kroah-Hartman Date: Fri, 10 Apr 2020 12:49:18 +0000 (+0200) Subject: 5.5-stable patches X-Git-Tag: v4.4.219~20 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=36cecfc365f1291ff2deebbc4574313043744759;p=thirdparty%2Fkernel%2Fstable-queue.git 5.5-stable patches added patches: include-uapi-linux-swab.h-fix-userspace-breakage-use-__bits_per_long-for-swap.patch --- diff --git a/queue-5.5/include-uapi-linux-swab.h-fix-userspace-breakage-use-__bits_per_long-for-swap.patch b/queue-5.5/include-uapi-linux-swab.h-fix-userspace-breakage-use-__bits_per_long-for-swap.patch new file mode 100644 index 00000000000..6e9b917b3a2 --- /dev/null +++ b/queue-5.5/include-uapi-linux-swab.h-fix-userspace-breakage-use-__bits_per_long-for-swap.patch @@ -0,0 +1,71 @@ +From 467d12f5c7842896d2de3ced74e4147ee29e97c8 Mon Sep 17 00:00:00 2001 +From: Christian Borntraeger +Date: Thu, 20 Feb 2020 20:04:03 -0800 +Subject: include/uapi/linux/swab.h: fix userspace breakage, use __BITS_PER_LONG for swap + +From: Christian Borntraeger + +commit 467d12f5c7842896d2de3ced74e4147ee29e97c8 upstream. + +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 + +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 +Cc: Yury Norov +Cc: Allison Randal +Cc: Joe Perches +Cc: Thomas Gleixner +Cc: William Breathitt Gray +Cc: Torsten Hilbrich +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + include/uapi/linux/swab.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/include/uapi/linux/swab.h ++++ b/include/uapi/linux/swab.h +@@ -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 + } diff --git a/queue-5.5/series b/queue-5.5/series index 338eecf16f0..54c18baa487 100644 --- a/queue-5.5/series +++ b/queue-5.5/series @@ -18,6 +18,7 @@ random-always-use-batched-entropy-for-get_random_u-32-64.patch usb-dwc3-gadget-wrap-around-when-skip-trbs.patch uapi-rename-ext2_swab-to-swab-and-share-globally-in-swab.h.patch slub-improve-bit-diffusion-for-freelist-ptr-obfuscation.patch +include-uapi-linux-swab.h-fix-userspace-breakage-use-__bits_per_long-for-swap.patch tools-accounting-getdelays.c-fix-netlink-attribute-length.patch hwrng-imx-rngc-fix-an-error-path.patch acpi-pm-add-acpi_register_wakeup_handler.patch