From: Bart Van Assche <bvanass...@acm.org> [ Upstream commit 92d23c6e94157739b997cacce151586a0d07bb8a ]
There are two definitions of the is_signed_type() macro: one in <linux/overflow.h> and a second definition in <linux/trace_events.h>. As suggested by Linus Torvalds, move the definition of the is_signed_type() macro into the <linux/compiler.h> header file. Change the definition of the is_signed_type() macro to make sure that it does not trigger any sparse warnings with future versions of sparse for bitwise types. See also: https://lore.kernel.org/all/CAHk-=whjh6p+qzwudx5sovvhjs3wvzjqr6mduwheytf6pjw...@mail.gmail.com/ https://lore.kernel.org/all/CAHk-=wjqgnvfb4jehfr0xyzikdqvczoue96xr_nnf5kqam5...@mail.gmail.com/ Cc: Andrew Morton <a...@linux-foundation.org> Cc: Arnd Bergmann <a...@arndb.de> Cc: Dan Williams <dan.j.willi...@intel.com> Cc: Eric Dumazet <eduma...@google.com> Cc: Ingo Molnar <mi...@redhat.com> Cc: Isabella Basso <isabba...@riseup.net> Cc: "Jason A. Donenfeld" <ja...@zx2c4.com> Cc: Josh Poimboeuf <jpoim...@kernel.org> Cc: Luc Van Oostenryck <luc.vanoostenr...@gmail.com> Cc: Masami Hiramatsu <mhira...@kernel.org> Cc: Nathan Chancellor <nat...@kernel.org> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Rasmus Villemoes <li...@rasmusvillemoes.dk> Cc: Sander Vanheule <san...@svanheule.net> Cc: Steven Rostedt <rost...@goodmis.org> Cc: Vlastimil Babka <vba...@suse.cz> Cc: Yury Norov <yury.no...@gmail.com> Signed-off-by: Bart Van Assche <bvanass...@acm.org> Signed-off-by: Kees Cook <keesc...@chromium.org> Link: https://lore.kernel.org/r/20220826162116.1050972-3-bvanass...@acm.org Signed-off-by: Eliav Farber <farb...@amazon.com> --- include/linux/compiler.h | 6 ++++++ include/linux/overflow.h | 1 - include/linux/trace_events.h | 2 -- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/linux/compiler.h b/include/linux/compiler.h index bbd74420fa21..004a030d5ad2 100644 --- a/include/linux/compiler.h +++ b/include/linux/compiler.h @@ -245,6 +245,12 @@ static inline void *offset_to_ptr(const int *off) /* &a[0] degrades to a pointer: a different type from an array */ #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0])) +/* + * Whether 'type' is a signed type or an unsigned type. Supports scalar types, + * bool and also pointer types. + */ +#define is_signed_type(type) (((type)(-1)) < (__force type)1) + /* * This is needed in functions which generate the stack canary, see * arch/x86/kernel/smpboot.c::start_secondary() for an example. diff --git a/include/linux/overflow.h b/include/linux/overflow.h index 35af574d006f..66dd311ad8eb 100644 --- a/include/linux/overflow.h +++ b/include/linux/overflow.h @@ -32,7 +32,6 @@ * https://mail-index.netbsd.org/tech-misc/2007/02/05/0000.html - * credit to Christian Biere. */ -#define is_signed_type(type) (((type)(-1)) < (type)1) #define __type_half_max(type) ((type)1 << (8*sizeof(type) - 1 - is_signed_type(type))) #define type_max(T) ((T)((__type_half_max(T) - 1) + __type_half_max(T))) #define type_min(T) ((T)((T)-type_max(T)-(T)1)) diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h index 5af2acb9fb7d..0c8c3cf36f96 100644 --- a/include/linux/trace_events.h +++ b/include/linux/trace_events.h @@ -700,8 +700,6 @@ extern int trace_add_event_call(struct trace_event_call *call); extern int trace_remove_event_call(struct trace_event_call *call); extern int trace_event_get_offsets(struct trace_event_call *call); -#define is_signed_type(type) (((type)(-1)) < (type)1) - int ftrace_set_clr_event(struct trace_array *tr, char *buf, int set); int trace_set_clr_event(const char *system, const char *event, int set); int trace_array_set_clr_event(struct trace_array *tr, const char *system, -- 2.47.3
