tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

minmax.h: remove some #defines that are only expanded once

The bodies of __signed_type_use() and __unsigned_type_use() are much the
same size as their names - so put the bodies in the only line that expands
them.

Similarly __signed_type() is defined separately for 64bit and then used
exactly once just below.

Change the test for __signed_type from CONFIG_64BIT to one based on gcc
defined macros so that the code is valid if it gets used outside of a
kernel build.

Link: https://lkml.kernel.org/r/9386d1ebb8974fbabbed2635160c3975@AcuMS.aculab.com
Signed-off-by: David Laight <david.laight@aculab.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Arnd Bergmann <arnd@kernel.org>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Dan Carpenter <dan.carpenter@linaro.org>
Cc: Jason A. Donenfeld <Jason@zx2c4.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Cc: Mateusz Guzik <mjguzik@gmail.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Pedro Falcato <pedro.falcato@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

authored by

David Laight and committed by
Andrew Morton 2b97aaf7 495bba17

+6 -8
+6 -8
include/linux/minmax.h
··· 46 46 * comparison, and these expressions only need to be careful to not cause 47 47 * warnings for pointer use. 48 48 */ 49 - #define __signed_type_use(ux) (2 + __is_nonneg(ux)) 50 - #define __unsigned_type_use(ux) (1 + 2 * (sizeof(ux) < 4)) 51 49 #define __sign_use(ux) (is_signed_type(typeof(ux)) ? \ 52 - __signed_type_use(ux) : __unsigned_type_use(ux)) 50 + (2 + __is_nonneg(ux)) : (1 + 2 * (sizeof(ux) < 4))) 53 51 54 52 /* 55 53 * Check whether a signed value is always non-negative. ··· 55 57 * A cast is needed to avoid any warnings from values that aren't signed 56 58 * integer types (in which case the result doesn't matter). 57 59 * 58 - * On 64-bit any integer or pointer type can safely be cast to 'long'. 60 + * On 64-bit any integer or pointer type can safely be cast to 'long long'. 59 61 * But on 32-bit we need to avoid warnings about casting pointers to integers 60 62 * of different sizes without truncating 64-bit values so 'long' or 'long long' 61 63 * must be used depending on the size of the value. ··· 64 66 * them, but we do not use s128 types in the kernel (we do use 'u128', 65 67 * but they are handled by the !is_signed_type() case). 66 68 */ 67 - #ifdef CONFIG_64BIT 68 - #define __signed_type(ux) long 69 + #if __SIZEOF_POINTER__ == __SIZEOF_LONG_LONG__ 70 + #define __is_nonneg(ux) statically_true((long long)(ux) >= 0) 69 71 #else 70 - #define __signed_type(ux) typeof(__builtin_choose_expr(sizeof(ux) > 4, 1LL, 1L)) 72 + #define __is_nonneg(ux) statically_true( \ 73 + (typeof(__builtin_choose_expr(sizeof(ux) > 4, 1LL, 1L)))(ux) >= 0) 71 74 #endif 72 - #define __is_nonneg(ux) statically_true((__signed_type(ux))(ux) >= 0) 73 75 74 76 #define __types_ok(ux, uy) \ 75 77 (__sign_use(ux) & __sign_use(uy))