mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-04 08:08:54 +00:00
4f7892f242
[ Upstream commit97c318bfbe] cxl_pmem.ko uses memory_add_physaddr_to_nid() but ia64 does not export it, so this causes a build error: ERROR: modpost: "memory_add_physaddr_to_nid" [drivers/cxl/cxl_pmem.ko] undefined! Fix this by exporting that function. Fixes:8c2676a587("hot-add-mem x86_64: memory_add_physaddr_to_nid node fixup") Reported-by: kernel test robot <lkp@intel.com> Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Cc: Dan Williams <dan.j.williams@intel.com> Cc: Ben Widawsky <bwidawsk@kernel.org> Cc: Jonathan Cameron <Jonathan.Cameron@huawei.com> Cc: linux-ia64@vger.kernel.org Cc: Arnd Bergmann <arnd@arndb.de> Cc: Keith Mannthey <kmannth@us.ibm.com> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Sasha Levin <sashal@kernel.org>
80 lines
2 KiB
C
80 lines
2 KiB
C
/*
|
|
* This file is subject to the terms and conditions of the GNU General Public
|
|
* License. See the file "COPYING" in the main directory of this archive
|
|
* for more details.
|
|
*
|
|
* This file contains NUMA specific variables and functions which are used on
|
|
* NUMA machines with contiguous memory.
|
|
*
|
|
* 2002/08/07 Erich Focht <efocht@ess.nec.de>
|
|
*/
|
|
|
|
#include <linux/cpu.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/node.h>
|
|
#include <linux/init.h>
|
|
#include <linux/memblock.h>
|
|
#include <linux/module.h>
|
|
#include <asm/mmzone.h>
|
|
#include <asm/numa.h>
|
|
|
|
|
|
/*
|
|
* The following structures are usually initialized by ACPI or
|
|
* similar mechanisms and describe the NUMA characteristics of the machine.
|
|
*/
|
|
int num_node_memblks;
|
|
struct node_memblk_s node_memblk[NR_NODE_MEMBLKS];
|
|
struct node_cpuid_s node_cpuid[NR_CPUS] =
|
|
{ [0 ... NR_CPUS-1] = { .phys_id = 0, .nid = NUMA_NO_NODE } };
|
|
|
|
/*
|
|
* This is a matrix with "distances" between nodes, they should be
|
|
* proportional to the memory access latency ratios.
|
|
*/
|
|
u8 numa_slit[MAX_NUMNODES * MAX_NUMNODES];
|
|
|
|
int __node_distance(int from, int to)
|
|
{
|
|
return slit_distance(from, to);
|
|
}
|
|
EXPORT_SYMBOL(__node_distance);
|
|
|
|
/* Identify which cnode a physical address resides on */
|
|
int
|
|
paddr_to_nid(unsigned long paddr)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < num_node_memblks; i++)
|
|
if (paddr >= node_memblk[i].start_paddr &&
|
|
paddr < node_memblk[i].start_paddr + node_memblk[i].size)
|
|
break;
|
|
|
|
return (i < num_node_memblks) ? node_memblk[i].nid : (num_node_memblks ? -1 : 0);
|
|
}
|
|
EXPORT_SYMBOL(paddr_to_nid);
|
|
|
|
#if defined(CONFIG_SPARSEMEM) && defined(CONFIG_NUMA)
|
|
void numa_clear_node(int cpu)
|
|
{
|
|
unmap_cpu_from_node(cpu, NUMA_NO_NODE);
|
|
}
|
|
|
|
#ifdef CONFIG_MEMORY_HOTPLUG
|
|
/*
|
|
* SRAT information is stored in node_memblk[], then we can use SRAT
|
|
* information at memory-hot-add if necessary.
|
|
*/
|
|
|
|
int memory_add_physaddr_to_nid(u64 addr)
|
|
{
|
|
int nid = paddr_to_nid(addr);
|
|
if (nid < 0)
|
|
return 0;
|
|
return nid;
|
|
}
|
|
EXPORT_SYMBOL(memory_add_physaddr_to_nid);
|
|
#endif
|
|
#endif
|