aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/memremap.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/memremap.c')
-rw-r--r--kernel/memremap.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/kernel/memremap.c b/kernel/memremap.c
index 017532193fb1..ddb3247a872a 100644
--- a/kernel/memremap.c
+++ b/kernel/memremap.c
@@ -308,12 +308,6 @@ void *devm_memremap_pages(struct device *dev, struct resource *res,
308 if (is_ram == REGION_INTERSECTS) 308 if (is_ram == REGION_INTERSECTS)
309 return __va(res->start); 309 return __va(res->start);
310 310
311 if (altmap && !IS_ENABLED(CONFIG_SPARSEMEM_VMEMMAP)) {
312 dev_err(dev, "%s: altmap requires CONFIG_SPARSEMEM_VMEMMAP=y\n",
313 __func__);
314 return ERR_PTR(-ENXIO);
315 }
316
317 if (!ref) 311 if (!ref)
318 return ERR_PTR(-EINVAL); 312 return ERR_PTR(-EINVAL);
319 313
@@ -401,7 +395,6 @@ void vmem_altmap_free(struct vmem_altmap *altmap, unsigned long nr_pfns)
401 altmap->alloc -= nr_pfns; 395 altmap->alloc -= nr_pfns;
402} 396}
403 397
404#ifdef CONFIG_SPARSEMEM_VMEMMAP
405struct vmem_altmap *to_vmem_altmap(unsigned long memmap_start) 398struct vmem_altmap *to_vmem_altmap(unsigned long memmap_start)
406{ 399{
407 /* 400 /*
@@ -427,5 +420,4 @@ struct vmem_altmap *to_vmem_altmap(unsigned long memmap_start)
427 420
428 return pgmap ? pgmap->altmap : NULL; 421 return pgmap ? pgmap->altmap : NULL;
429} 422}
430#endif /* CONFIG_SPARSEMEM_VMEMMAP */
431#endif /* CONFIG_ZONE_DEVICE */ 423#endif /* CONFIG_ZONE_DEVICE */