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

This reverts commit e1431faa89 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>
This commit is contained in:
Greg Kroah-Hartman 2023-05-31 16:05:16 +00:00
parent 673a774ad6
commit 2bd517d6bc

View File

@ -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))