* [folded-merged] mm-fix-phys_to_target_node-and-memory_add_physaddr_to_nid-exports-v4-fix.patch removed from -mm tree
@ 2020-11-22 6:11 akpm
0 siblings, 0 replies; only message in thread
From: akpm @ 2020-11-22 6:11 UTC (permalink / raw)
To: benh, dan.j.williams, lkp, mm-commits, mpe, paulus
The patch titled
Subject: powerpc: fix create_section_mapping compile warning
has been removed from the -mm tree. Its filename was
mm-fix-phys_to_target_node-and-memory_add_physaddr_to_nid-exports-v4-fix.patch
This patch was dropped because it was folded into mm-fix-phys_to_target_node-and-memory_add_physaddr_to_nid-exports.patch
------------------------------------------------------
From: Dan Williams <dan.j.williams@intel.com>
Subject: powerpc: fix create_section_mapping compile warning
0day robot reports that a recent rework of how
memory_add_physaddr_to_nid() and phys_to_target_node() are declared
resulted in the following new compilation warning:
arch/powerpc/mm/mem.c:91:12: warning: no previous prototype for 'create_section_mapping' [-Wmissing-prototypes]
91 | int __weak create_section_mapping(unsigned long start, unsigned long end,
| ^~~~~~~~~~~~~~~~~~~~~~
...fix this by moving the declaration of create_section_mapping()
outside of the CONFIG_NEED_MULTIPLE_NODES ifdef guard, and include an
explicit include of asm/mmzone.h in mem.c. An include of linux/mmzone.h
is not sufficient.
Link: https://lkml.kernel.org/r/160558386174.2948926.2740149041249041764.stgit@dwillia2-desk3.amr.corp.intel.com
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Reported-by: kernel test robot <lkp@intel.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
arch/powerpc/include/asm/mmzone.h | 7 +++++--
arch/powerpc/mm/mem.c | 1 +
2 files changed, 6 insertions(+), 2 deletions(-)
--- a/arch/powerpc/include/asm/mmzone.h~mm-fix-phys_to_target_node-and-memory_add_physaddr_to_nid-exports-v4-fix
+++ a/arch/powerpc/include/asm/mmzone.h
@@ -33,8 +33,6 @@ extern struct pglist_data *node_data[];
extern int numa_cpu_lookup_table[];
extern cpumask_var_t node_to_cpumask_map[];
#ifdef CONFIG_MEMORY_HOTPLUG
-extern int create_section_mapping(unsigned long start, unsigned long end,
- int nid, pgprot_t prot);
extern unsigned long max_pfn;
u64 memory_hotplug_max(void);
#else
@@ -48,5 +46,10 @@ u64 memory_hotplug_max(void);
#define __HAVE_ARCH_RESERVED_KERNEL_PAGES
#endif
+#ifdef CONFIG_MEMORY_HOTPLUG
+extern int create_section_mapping(unsigned long start, unsigned long end,
+ int nid, pgprot_t prot);
+#endif
+
#endif /* __KERNEL__ */
#endif /* _ASM_MMZONE_H_ */
--- a/arch/powerpc/mm/mem.c~mm-fix-phys_to_target_node-and-memory_add_physaddr_to_nid-exports-v4-fix
+++ a/arch/powerpc/mm/mem.c
@@ -50,6 +50,7 @@
#include <asm/rtas.h>
#include <asm/kasan.h>
#include <asm/svm.h>
+#include <asm/mmzone.h>
#include <mm/mmu_decl.h>
_
Patches currently in -mm which might be from dan.j.williams@intel.com are
mm-fix-phys_to_target_node-and-memory_add_physaddr_to_nid-exports.patch
device-dax-kmem-use-struct_size.patch
xen-unpopulated-alloc-consolidate-pgmap-manipulation.patch
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-11-22 6:11 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-22 6:11 [folded-merged] mm-fix-phys_to_target_node-and-memory_add_physaddr_to_nid-exports-v4-fix.patch removed from -mm tree akpm
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.