lkml.org 
[lkml]   [2020]   [Jun]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 23/48] include/asm-generic/topology.h: guard cpumask_of_node() macro argument
    Date
    From: Arnd Bergmann <arnd@arndb.de>

    [ Upstream commit 4377748c7b5187c3342a60fa2ceb60c8a57a8488 ]

    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 <arnd@arndb.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Acked-by: Guenter Roeck <linux@roeck-us.net>
    Link: http://lkml.kernel.org/r/20200527134623.930247-1-arnd@arndb.de
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    include/asm-generic/topology.h | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/include/asm-generic/topology.h b/include/asm-generic/topology.h
    index 5d2add1a6c96..864fcfa1df41 100644
    --- a/include/asm-generic/topology.h
    +++ b/include/asm-generic/topology.h
    @@ -51,7 +51,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
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-06-01 21:02    [W:5.002 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site