diff options
author | Dan Williams <dan.j.williams@intel.com> | 2016-03-09 17:15:43 -0800 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2016-03-09 17:15:43 -0800 |
commit | 489011652a2d5555901def04c24d68874e8ba9a1 (patch) | |
tree | f4d000e5ae63350016d12e6ccb52b0809bb814df /mm | |
parent | 59e6473980f321c16299e12db69d1fabc2644a6f (diff) | |
parent | ff8e92d5d94b99aab39f439d532cba435947dfc0 (diff) |
Merge branch 'for-4.6/pfn' into libnvdimm-for-nextlibnvdimm-for-4.6
Diffstat (limited to 'mm')
-rw-r--r-- | mm/memory_hotplug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 4af58a3a8ffa..979b18cbd343 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -138,7 +138,7 @@ static struct resource *register_memory_resource(u64 start, u64 size) res->name = "System RAM"; res->start = start; res->end = start + size - 1; - res->flags = IORESOURCE_MEM | IORESOURCE_BUSY; + res->flags = IORESOURCE_SYSTEM_RAM | IORESOURCE_BUSY; if (request_resource(&iomem_resource, res) < 0) { pr_debug("System RAM resource %pR cannot be added\n", res); kfree(res); |