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 /arch/powerpc/mm/mem.c | |
| parent | 59e6473980f321c16299e12db69d1fabc2644a6f (diff) | |
| parent | ff8e92d5d94b99aab39f439d532cba435947dfc0 (diff) | |
Merge branch 'for-4.6/pfn' into libnvdimm-for-nextlibnvdimm-for-4.6
Diffstat (limited to 'arch/powerpc/mm/mem.c')
| -rw-r--r-- | arch/powerpc/mm/mem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c index d0f0a514b04e..f078a1f94fc2 100644 --- a/arch/powerpc/mm/mem.c +++ b/arch/powerpc/mm/mem.c @@ -541,7 +541,7 @@ static int __init add_system_ram_resources(void) res->name = "System RAM"; res->start = base; res->end = base + size - 1; - res->flags = IORESOURCE_MEM | IORESOURCE_BUSY; + res->flags = IORESOURCE_SYSTEM_RAM | IORESOURCE_BUSY; WARN_ON(request_resource(&iomem_resource, res) < 0); } } |