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/x86/kernel/pmem.c | |
| parent | 59e6473980f321c16299e12db69d1fabc2644a6f (diff) | |
| parent | ff8e92d5d94b99aab39f439d532cba435947dfc0 (diff) | |
Merge branch 'for-4.6/pfn' into libnvdimm-for-nextlibnvdimm-for-4.6
Diffstat (limited to 'arch/x86/kernel/pmem.c')
| -rw-r--r-- | arch/x86/kernel/pmem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/pmem.c b/arch/x86/kernel/pmem.c index 14415aff1813..92f70147a9a6 100644 --- a/arch/x86/kernel/pmem.c +++ b/arch/x86/kernel/pmem.c @@ -13,11 +13,11 @@ static int found(u64 start, u64 end, void *data) static __init int register_e820_pmem(void) { - char *pmem = "Persistent Memory (legacy)"; struct platform_device *pdev; int rc; - rc = walk_iomem_res(pmem, IORESOURCE_MEM, 0, -1, NULL, found); + rc = walk_iomem_res_desc(IORES_DESC_PERSISTENT_MEMORY_LEGACY, + IORESOURCE_MEM, 0, -1, NULL, found); if (rc <= 0) return 0; |