projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://repo.or.cz/cris-mirror
[firefly-linux-kernel-4.4.55.git]
/
mm
/
memory_hotplug.c
diff --git
a/mm/memory_hotplug.c
b/mm/memory_hotplug.c
index efe3e0ec2e614c4a8f132ea8669fb63e274e5140..821dee596377fadcd93e2116e117eea0a0340e97 100644
(file)
--- a/
mm/memory_hotplug.c
+++ b/
mm/memory_hotplug.c
@@
-413,7
+413,7
@@
int online_pages(unsigned long pfn, unsigned long nr_pages)
if (!populated_zone(zone))
need_zonelists_rebuild = 1;
if (!populated_zone(zone))
need_zonelists_rebuild = 1;
- ret = walk_
memory_resourc
e(pfn, nr_pages, &onlined_pages,
+ ret = walk_
system_ram_rang
e(pfn, nr_pages, &onlined_pages,
online_pages_range);
if (ret) {
printk(KERN_DEBUG "online_pages %lx at %lx failed\n",
online_pages_range);
if (ret) {
printk(KERN_DEBUG "online_pages %lx at %lx failed\n",
@@
-705,7
+705,7
@@
offline_isolated_pages_cb(unsigned long start, unsigned long nr_pages,
static void
offline_isolated_pages(unsigned long start_pfn, unsigned long end_pfn)
{
static void
offline_isolated_pages(unsigned long start_pfn, unsigned long end_pfn)
{
- walk_
memory_resourc
e(start_pfn, end_pfn - start_pfn, NULL,
+ walk_
system_ram_rang
e(start_pfn, end_pfn - start_pfn, NULL,
offline_isolated_pages_cb);
}
offline_isolated_pages_cb);
}
@@
-731,7
+731,7
@@
check_pages_isolated(unsigned long start_pfn, unsigned long end_pfn)
long offlined = 0;
int ret;
long offlined = 0;
int ret;
- ret = walk_
memory_resourc
e(start_pfn, end_pfn - start_pfn, &offlined,
+ ret = walk_
system_ram_rang
e(start_pfn, end_pfn - start_pfn, &offlined,
check_pages_isolated_cb);
if (ret < 0)
offlined = (long)ret;
check_pages_isolated_cb);
if (ret < 0)
offlined = (long)ret;