Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 221e3ebf authored by Heiko Carstens's avatar Heiko Carstens Committed by Linus Torvalds
Browse files

cpumask: let num_*_cpus() function always return unsigned values 



Dependent on CONFIG_SMP the num_*_cpus() functions return unsigned or
signed values.  Let them always return unsigned values to avoid strange
casts.

Fixes at least one warning:

 kernel/kprobes.c: In function 'register_kretprobe':
 kernel/kprobes.c:1038: warning: comparison of distinct pointer types lacks a cast

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: Masami Hiramatsu <mhiramat@redhat.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8aaed5be

include/linux/cpumask.h

+4 −4
Original line number Diff line number Diff line
@@ -90,10 +90,10 @@ extern const struct cpumask *const cpu_active_mask; 
#define cpu_present(cpu)	cpumask_test_cpu((cpu), cpu_present_mask)

#define cpu_active(cpu)		cpumask_test_cpu((cpu), cpu_active_mask)

#else

#define num_online_cpus()	1

#define num_possible_cpus()	1

#define num_present_cpus()	1

#define num_active_cpus()	1

#define num_online_cpus()	1U

#define num_possible_cpus()	1U

#define num_present_cpus()	1U

#define num_active_cpus()	1U

#define cpu_online(cpu)		((cpu) == 0)

#define cpu_possible(cpu)	((cpu) == 0)

#define cpu_present(cpu)	((cpu) == 0)