Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 06:01:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

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

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet 2023-12-11 13:27:00 -05:00
parent 04bc786d66
commit d7a73e3f08
3 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
include/linux/numa.h
View File

@ -1,6 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
#ifndef _LINUX_NUMA_H #ifndef _LINUX_NUMA_H
#define _LINUX_NUMA_H #define _LINUX_NUMA_H
#include <linux/init.h>
#include <linux/types.h> #include <linux/types.h>
#ifdef CONFIG_NODES_SHIFT #ifdef CONFIG_NODES_SHIFT
@ -22,34 +23,26 @@
#endif #endif
#ifdef CONFIG_NUMA #ifdef CONFIG_NUMA
#include <linux/printk.h>
#include <asm/sparsemem.h> #include <asm/sparsemem.h>
/* Generic implementation available */ /* Generic implementation available */
int numa_nearest_node(int node, unsigned int state); int numa_nearest_node(int node, unsigned int state);
#ifndef memory_add_physaddr_to_nid #ifndef memory_add_physaddr_to_nid
static inline int memory_add_physaddr_to_nid(u64 start) 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;
}
#endif #endif
#ifndef phys_to_target_node #ifndef phys_to_target_node
static inline int phys_to_target_node(u64 start) 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;
}
#endif #endif
#ifndef numa_fill_memblks #ifndef numa_fill_memblks
static inline int __init numa_fill_memblks(u64 start, u64 end) static inline int __init numa_fill_memblks(u64 start, u64 end)
{ {
return NUMA_NO_MEMBLK; return NUMA_NO_MEMBLK;
} }
#endif #endif
#else /* !CONFIG_NUMA */ #else /* !CONFIG_NUMA */
static inline int numa_nearest_node(int node, unsigned int state) static inline int numa_nearest_node(int node, unsigned int state)
{ {

1
kernel/Makefile
View File

@ -114,6 +114,7 @@ obj-$(CONFIG_SHADOW_CALL_STACK) += scs.o
obj-$(CONFIG_HAVE_STATIC_CALL) += static_call.o obj-$(CONFIG_HAVE_STATIC_CALL) += static_call.o
obj-$(CONFIG_HAVE_STATIC_CALL_INLINE) += static_call_inline.o obj-$(CONFIG_HAVE_STATIC_CALL_INLINE) += static_call_inline.o
obj-$(CONFIG_CFI_CLANG) += cfi.o obj-$(CONFIG_CFI_CLANG) += cfi.o
obj-$(CONFIG_NUMA) += numa.o
obj-$(CONFIG_PERF_EVENTS) += events/ obj-$(CONFIG_PERF_EVENTS) += events/

26
kernel/numa.c Normal file
View File

@ -0,0 +1,26 @@
// 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