Commit d7a73e3f authored by Kent Overstreet's avatar Kent Overstreet
Browse files

kernel/numa.c: Move logging out of numa.h 



Moving these stub functions to a .c file means we can kill a sched.h
dependency on printk.h.

Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
parent 04bc786d

include/linux/numa.h

+6 −13
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _LINUX_NUMA_H

#define _LINUX_NUMA_H

#include <linux/init.h>

#include <linux/types.h>



#ifdef CONFIG_NODES_SHIFT
@@ -22,34 +23,26 @@ 
#endif



#ifdef CONFIG_NUMA

#include <linux/printk.h>

#include <asm/sparsemem.h>



/* Generic implementation available */

int numa_nearest_node(int node, unsigned int state);



#ifndef memory_add_physaddr_to_nid

static inline int memory_add_physaddr_to_nid(u64 start)

{

	pr_info_once("Unknown online node for memory at 0x%llx, assuming node 0\n",

			start);

	return 0;

}

int memory_add_physaddr_to_nid(u64 start);

#endif



#ifndef phys_to_target_node

static inline int phys_to_target_node(u64 start)

{

	pr_info_once("Unknown target node for memory at 0x%llx, assuming node 0\n",

			start);

	return 0;

}

int phys_to_target_node(u64 start);

#endif



#ifndef numa_fill_memblks

static inline int __init numa_fill_memblks(u64 start, u64 end)

{

	return NUMA_NO_MEMBLK;

}

#endif



#else /* !CONFIG_NUMA */

static inline int numa_nearest_node(int node, unsigned int state)

{

kernel/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ obj-$(CONFIG_SHADOW_CALL_STACK) += scs.o 
obj-$(CONFIG_HAVE_STATIC_CALL) += static_call.o

obj-$(CONFIG_HAVE_STATIC_CALL_INLINE) += static_call_inline.o

obj-$(CONFIG_CFI_CLANG) += cfi.o

obj-$(CONFIG_NUMA) += numa.o



obj-$(CONFIG_PERF_EVENTS) += events/

kernel/numa.c

0 → 100644
+26 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later



#include <linux/printk.h>

#include <linux/numa.h>



/* Stub functions: */



#ifndef memory_add_physaddr_to_nid

int memory_add_physaddr_to_nid(u64 start)

{

	pr_info_once("Unknown online node for memory at 0x%llx, assuming node 0\n",

			start);

	return 0;

}

EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid);

#endif



#ifndef phys_to_target_node

int phys_to_target_node(u64 start)

{

	pr_info_once("Unknown target node for memory at 0x%llx, assuming node 0\n",

			start);

	return 0;

}

EXPORT_SYMBOL_GPL(phys_to_target_node);

#endif