cpumask: guard cpumask_of_node() macro argument
Arnd Bergmann
maintainerPATCH 1/1 cpumask: guard cpumask_of_node() macro argument
drivers/hwmon/amd_energy.c:195:15: error: invalid operands to binary expression ('void' and 'int')
(channel - data->nr_cpus));
~~~~~~~~~^~~~~~~~~~~~~~~~~
include/asm-generic/topology.h:51:42: note: expanded from macro 'cpumask_of_node'
#define cpumask_of_node(node) ((void)node, cpu_online_mask)
^~~~
include/linux/cpumask.h:618:72: note: expanded from macro 'cpumask_first_and'
#define cpumask_first_and(src1p, src2p) cpumask_next_and(-1, (src1p), (src2p))
^~~~~Fixes f0b848ce6fe9 ("cpumask: Introduce cpumask_of_{node,pcibus} to replace {node,pcibus}_to_cpumask")
Fixes 8abee9566b7e ("hwmon: Add amd_energy driver to report energy counters")
Signed-off-by Arnd Bergmann <[email protected]>
--- include/asm-generic/topology.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/asm-generic/topology.h +1 -1
@@ -48,7 +48,7 @@#ifdef CONFIG_NEED_MULTIPLE_NODES #define cpumask_of_node (node) ((node) == 0 ? cpu_online_mask : cpu_none_mask)#else -#define cpumask_of_node (node) ((void)node, cpu_online_mask) +#define cpumask_of_node (node) ((void)(node), cpu_online_mask)#endif #endif #ifndef pcibus_to_node
Signature · 1 line
2.26.2
Quoted 10 lines · Arnd Bergmann
drivers/hwmon/amd_energy.c:195:15: error: invalid operands to binary expression ('void' and 'int')(channel - data->nr_cpus)); ~~~~~~~~~^~~~~~~~~~~~~~~~~ include/asm-generic/topology.h:51:42: note: expanded from macro 'cpumask_of_node' #define cpumask_of_node(node) ((void)node, cpu_online_mask) ^~~~ include/linux/cpumask.h:618:72: note: expanded from macro 'cpumask_first_and' #define cpumask_first_and(src1p, src2p) cpumask_next_and(-1, (src1p), (src2p)) ^~~~~
Quoted 3 lines
Fixes f0b848ce6fe9 ("cpumask: Introduce cpumask_of_{node,pcibus} to replace {node,pcibus}_to_cpumask")Fixes 8abee9566b7e ("hwmon: Add amd_energy driver to report energy counters")Signed-off-by Arnd Bergmann <[email protected]>
Didn't I Cc: you on the same patch I sent out earlier ? Never mind, though.
Acked-by Guenter Roeck <[email protected]>
Guenter
Quoted 20 lines
--- include/asm-generic/topology.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)include/asm-generic/topology.h +1
-1@@ -48,7 +48,7 @@#ifdef CONFIG_NEED_MULTIPLE_NODES #define cpumask_of_node (node) ((node) == 0 ? cpu_online_mask : cpu_none_mask)#else -#define cpumask_of_node (node) ((void)node, cpu_online_mask) +#define cpumask_of_node (node) ((void)(node), cpu_online_mask)#endif #endif #ifndef pcibus_to_nodeSignature · 1 line
2.26.2