The patch titled
Subject: mm-memory_hotplug-provide-a-more-generic-restrictions-for-memory-hotplug-fix
has been added to the -mm tree. Its filename is
mm-memory_hotplug-provide-a-more-generic-restrictions-for-memory-hotplug-fix.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/mm-memory_hotplug-provide-a-more-generic-restrictions-for-memory-hotplug-fix.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/mm-memory_hotplug-provide-a-more-generic-restrictions-for-memory-hotplug-fix.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm-memory_hotplug-provide-a-more-generic-restrictions-for-memory-hotplug-fix
x86_64 allnoconfig:
In file included from ./include/linux/mmzone.h:744:0,
from ./include/linux/gfp.h:6,
from ./include/linux/umh.h:4,
from ./include/linux/kmod.h:22,
from ./include/linux/module.h:13,
from init/do_mounts.c:1:
./include/linux/memory_hotplug.h:353:11: warning: ‘struct mhp_restrictions’ declared inside parameter list will not be visible outside of this definition or declaration
struct mhp_restrictions *restrictions);
^~~~~~~~~~~~~~~~
Fix this by moving the arch_add_memory() definition inside
CONFIG_MEMORY_HOTPLUG and moving the mhp_restrictions definition to a more
appropriate place.
Cc: Dan Williams <dan.j.williams@xxxxxxxxx>
Cc: David Hildenbrand <david@xxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxx>
Cc: Oscar Salvador <osalvador@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/memory_hotplug.h | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
--- a/include/linux/memory_hotplug.h~mm-memory_hotplug-provide-a-more-generic-restrictions-for-memory-hotplug-fix
+++ a/include/linux/memory_hotplug.h
@@ -54,6 +54,16 @@ enum {
};
/*
+ * Restrictions for the memory hotplug:
+ * flags: MHP_ flags
+ * altmap: alternative allocator for memmap array
+ */
+struct mhp_restrictions {
+ unsigned long flags;
+ struct vmem_altmap *altmap;
+};
+
+/*
* Zone resizing functions
*
* Note: any attempt to resize a zone should has pgdat_resize_lock()
@@ -101,6 +111,8 @@ extern void __online_page_free(struct pa
extern int try_online_node(int nid);
+extern int arch_add_memory(int nid, u64 start, u64 size,
+ struct mhp_restrictions *restrictions);
extern u64 max_mem_size;
extern bool memhp_auto_online;
@@ -126,16 +138,6 @@ extern int __remove_pages(struct zone *z
#define MHP_MEMBLOCK_API (1<<0)
-/*
- * Restrictions for the memory hotplug:
- * flags: MHP_ flags
- * altmap: alternative allocator for memmap array
- */
-struct mhp_restrictions {
- unsigned long flags;
- struct vmem_altmap *altmap;
-};
-
/* reasonably generic interface to expand the physical pages */
extern int __add_pages(int nid, unsigned long start_pfn, unsigned long nr_pages,
struct mhp_restrictions *restrictions);
@@ -349,8 +351,6 @@ extern int walk_memory_range(unsigned lo
extern int __add_memory(int nid, u64 start, u64 size);
extern int add_memory(int nid, u64 start, u64 size);
extern int add_memory_resource(int nid, struct resource *resource);
-extern int arch_add_memory(int nid, u64 start, u64 size,
- struct mhp_restrictions *restrictions);
extern void move_pfn_range_to_zone(struct zone *zone, unsigned long start_pfn,
unsigned long nr_pages, struct vmem_altmap *altmap);
extern bool is_memblock_offlined(struct memory_block *mem);
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
ocfs2-clear-zero-in-unaligned-direct-io-checkpatch-fixes.patch
mm.patch
userfaultfd-sysctl-add-vmunprivileged_userfaultfd-fix.patch
mm-compaction-fix-an-undefined-behaviour-fix.patch
mm-enable-error-injection-at-add_to_page_cache-fix.patch
mm-memory_hotplug-provide-a-more-generic-restrictions-for-memory-hotplug-fix.patch
mm-add-probe_user_read-fix.patch
mm-maintain-randomization-of-page-free-lists-checkpatch-fixes.patch
fs-binfmt_elfc-remove-unneeded-initialization-of-mm-start_stack.patch
convert-struct-pid-count-to-refcount_t-fix.patch
linux-next-rejects.patch
linux-next-git-rejects.patch
scripts-atomic-check-atomicssh-dont-assume-that-scripts-are-executable.patch
mm-rename-ambiguously-named-memorystat-counters-and-functions-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch
