diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2015-11-30 09:10:33 -0800 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2015-11-30 09:10:33 -0800 |
| commit | bc0d0d093b379b0b379c429e3348498287c8a9ca (patch) | |
| tree | 0e20a4644c52a6ec25d8509af033f6155475eec9 /arch/x86/kernel/pmem.c | |
| parent | 31ade3b83e1821da5fbb2f11b5b3d4ab2ec39db8 (diff) | |
| download | linux-bc0d0d093b379b0b379c429e3348498287c8a9ca.tar.bz2 | |
libnvdimm, e820: skip module loading when no type-12
If there are no persistent memory ranges present then don't bother
creating the platform device. Otherwise, it loads the full libnvdimm
sub-system only to discover no resources present.
Reported-by: Andy Lutomirski <luto@amacapital.net>
Acked-by: Andy Lutomirski <luto@amacapital.net>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'arch/x86/kernel/pmem.c')
| -rw-r--r-- | arch/x86/kernel/pmem.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/x86/kernel/pmem.c b/arch/x86/kernel/pmem.c index 4f00b63d7ff3..14415aff1813 100644 --- a/arch/x86/kernel/pmem.c +++ b/arch/x86/kernel/pmem.c @@ -4,10 +4,22 @@ */ #include <linux/platform_device.h> #include <linux/module.h> +#include <linux/ioport.h> + +static int found(u64 start, u64 end, void *data) +{ + return 1; +} 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); + if (rc <= 0) + return 0; /* * See drivers/nvdimm/e820.c for the implementation, this is |