Commit a9acc03a authored May 31, 2023 by Greg Kroah-Hartman Committed by Matthias Männich Jun 08, 2023

Revert "uapi/linux/const.h: prefer ISO-friendly typeof"



This reverts commit 8fabf09f which is
commit 31088f6f7906253ef4577f6a9b84e2d42447dba0 upstream.

It breaks the CRC generation of loads of symbols, and is not needed at
all for any real Android issue at this point in time, so revert it to
preserve the ABI.

Bug: 161946584
Change-Id: I93095fb07b431a194e21bb21d4cd22435445dca3
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

parent 74e5c56b

include/uapi/linux/const.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@
		#define _BITUL(x) (_UL(1) << (x))
		#define _BITULL(x) (_ULL(1) << (x))

		#define __ALIGN_KERNEL(x, a) __ALIGN_KERNEL_MASK(x, (__typeof__(x))(a) - 1)
		#define __ALIGN_KERNEL(x, a) __ALIGN_KERNEL_MASK(x, (typeof(x))(a) - 1)
		#define __ALIGN_KERNEL_MASK(x, mask) (((x) + (mask)) & ~(mask))

		#define __KERNEL_DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d))