git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus-5.1a-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
include
/
linux
/
memory_hotplug.h
diff --git
a/include/linux/memory_hotplug.h
b/include/linux/memory_hotplug.h
index 52869d6d38b37307a36280654aa0d289eb773d10..8ade08c50d26bd3a0d3dc2ef2b391a8be046ab83 100644
(file)
--- a/
include/linux/memory_hotplug.h
+++ b/
include/linux/memory_hotplug.h
@@
-100,6
+100,8
@@
extern void __online_page_free(struct page *page);
extern int try_online_node(int nid);
+extern u64 max_mem_size;
+
extern bool memhp_auto_online;
/* If movable_node boot option specified */
extern bool movable_node_enabled;