forked from Minki/linux
4377748c7b
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: f0b848ce6f ("cpumask: Introduce cpumask_of_{node,pcibus} to replace {node,pcibus}_to_cpumask")
Fixes: 8abee9566b ("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>
78 lines
2.2 KiB
C
78 lines
2.2 KiB
C
/*
|
|
* linux/include/asm-generic/topology.h
|
|
*
|
|
* Written by: Matthew Dobson, IBM Corporation
|
|
*
|
|
* Copyright (C) 2002, IBM Corp.
|
|
*
|
|
* All rights reserved.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
|
|
* NON INFRINGEMENT. See the GNU General Public License for more
|
|
* details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
*
|
|
* Send feedback to <colpatch@us.ibm.com>
|
|
*/
|
|
#ifndef _ASM_GENERIC_TOPOLOGY_H
|
|
#define _ASM_GENERIC_TOPOLOGY_H
|
|
|
|
#ifndef CONFIG_NUMA
|
|
|
|
/* Other architectures wishing to use this simple topology API should fill
|
|
in the below functions as appropriate in their own <asm/topology.h> file. */
|
|
#ifndef cpu_to_node
|
|
#define cpu_to_node(cpu) ((void)(cpu),0)
|
|
#endif
|
|
#ifndef set_numa_node
|
|
#define set_numa_node(node)
|
|
#endif
|
|
#ifndef set_cpu_numa_node
|
|
#define set_cpu_numa_node(cpu, node)
|
|
#endif
|
|
#ifndef cpu_to_mem
|
|
#define cpu_to_mem(cpu) ((void)(cpu),0)
|
|
#endif
|
|
|
|
#ifndef cpumask_of_node
|
|
#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)
|
|
#endif
|
|
#endif
|
|
#ifndef pcibus_to_node
|
|
#define pcibus_to_node(bus) ((void)(bus), -1)
|
|
#endif
|
|
|
|
#ifndef cpumask_of_pcibus
|
|
#define cpumask_of_pcibus(bus) (pcibus_to_node(bus) == -1 ? \
|
|
cpu_all_mask : \
|
|
cpumask_of_node(pcibus_to_node(bus)))
|
|
#endif
|
|
|
|
#endif /* CONFIG_NUMA */
|
|
|
|
#if !defined(CONFIG_NUMA) || !defined(CONFIG_HAVE_MEMORYLESS_NODES)
|
|
|
|
#ifndef set_numa_mem
|
|
#define set_numa_mem(node)
|
|
#endif
|
|
#ifndef set_cpu_numa_mem
|
|
#define set_cpu_numa_mem(cpu, node)
|
|
#endif
|
|
|
|
#endif /* !CONFIG_NUMA || !CONFIG_HAVE_MEMORYLESS_NODES */
|
|
|
|
#endif /* _ASM_GENERIC_TOPOLOGY_H */
|