diff options
| author | Cédric Le Goater <clg@redhat.com> | 2023-07-09 23:23:08 +0200 |
|---|---|---|
| committer | Cédric Le Goater <clg@redhat.com> | 2023-07-10 09:52:52 +0200 |
| commit | d0bf492f3877d4187d2f7d0c0abb3a2bf3104392 (patch) | |
| tree | eadabad28d572a4711b26e5ab63e0114c3f751bf /linux-headers/asm-generic/bitsperlong.h | |
| parent | 8af87a3ec7e42ff1b9cf75ceee0451c31e34d153 (diff) | |
| download | focaccia-qemu-d0bf492f3877d4187d2f7d0c0abb3a2bf3104392.tar.gz focaccia-qemu-d0bf492f3877d4187d2f7d0c0abb3a2bf3104392.zip | |
linux-headers: update to v6.5-rc1
Reviewed-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Cédric Le Goater <clg@redhat.com>
Diffstat (limited to 'linux-headers/asm-generic/bitsperlong.h')
| -rw-r--r-- | linux-headers/asm-generic/bitsperlong.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/linux-headers/asm-generic/bitsperlong.h b/linux-headers/asm-generic/bitsperlong.h index 0aac245b6b..75f320fa91 100644 --- a/linux-headers/asm-generic/bitsperlong.h +++ b/linux-headers/asm-generic/bitsperlong.h @@ -2,6 +2,17 @@ #ifndef __ASM_GENERIC_BITS_PER_LONG #define __ASM_GENERIC_BITS_PER_LONG +#ifndef __BITS_PER_LONG +/* + * In order to keep safe and avoid regression, only unify uapi + * bitsperlong.h for some archs which are using newer toolchains + * that have the definitions of __CHAR_BIT__ and __SIZEOF_LONG__. + * See the following link for more info: + * https://lore.kernel.org/linux-arch/b9624545-2c80-49a1-ac3c-39264a591f7b@app.fastmail.com/ + */ +#if defined(__CHAR_BIT__) && defined(__SIZEOF_LONG__) +#define __BITS_PER_LONG (__CHAR_BIT__ * __SIZEOF_LONG__) +#else /* * There seems to be no way of detecting this automatically from user * space, so 64 bit architectures should override this in their @@ -9,8 +20,8 @@ * both 32 and 64 bit user space must not rely on CONFIG_64BIT * to decide it, but rather check a compiler provided macro. */ -#ifndef __BITS_PER_LONG #define __BITS_PER_LONG 32 #endif +#endif #endif /* __ASM_GENERIC_BITS_PER_LONG */ |