* [merged] mm-cleanup-ifdef-guards-for-vmem_altmap.patch removed from -mm tree
@ 2016-07-29 18:56 akpm
0 siblings, 0 replies; 2+ messages in thread
From: akpm @ 2016-07-29 18:56 UTC (permalink / raw)
To: dan.j.williams, jmoyer, sandeen, vbabka, mm-commits
The patch titled
Subject: mm: cleanup ifdef guards for vmem_altmap
has been removed from the -mm tree. Its filename was
mm-cleanup-ifdef-guards-for-vmem_altmap.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Dan Williams <dan.j.williams@intel.com>
Subject: mm: cleanup ifdef guards for vmem_altmap
Now that ZONE_DEVICE depends on SPARSEMEM_VMEMMAP we can simplify some
ifdef guards to just ZONE_DEVICE.
Link: http://lkml.kernel.org/r/146687646788.39261.8020536391978771940.stgit@dwillia2-desk3.amr.corp.intel.com
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Reported-by: Vlastimil Babka <vbabka@suse.cz>
Cc: Eric Sandeen <sandeen@redhat.com>
Cc: Jeff Moyer <jmoyer@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
include/linux/memremap.h | 2 +-
kernel/memremap.c | 8 --------
2 files changed, 1 insertion(+), 9 deletions(-)
diff -puN include/linux/memremap.h~mm-cleanup-ifdef-guards-for-vmem_altmap include/linux/memremap.h
--- a/include/linux/memremap.h~mm-cleanup-ifdef-guards-for-vmem_altmap
+++ a/include/linux/memremap.h
@@ -26,7 +26,7 @@ struct vmem_altmap {
unsigned long vmem_altmap_offset(struct vmem_altmap *altmap);
void vmem_altmap_free(struct vmem_altmap *altmap, unsigned long nr_pfns);
-#if defined(CONFIG_SPARSEMEM_VMEMMAP) && defined(CONFIG_ZONE_DEVICE)
+#ifdef CONFIG_ZONE_DEVICE
struct vmem_altmap *to_vmem_altmap(unsigned long memmap_start);
#else
static inline struct vmem_altmap *to_vmem_altmap(unsigned long memmap_start)
diff -puN kernel/memremap.c~mm-cleanup-ifdef-guards-for-vmem_altmap kernel/memremap.c
--- a/kernel/memremap.c~mm-cleanup-ifdef-guards-for-vmem_altmap
+++ a/kernel/memremap.c
@@ -308,12 +308,6 @@ void *devm_memremap_pages(struct device
if (is_ram == REGION_INTERSECTS)
return __va(res->start);
- if (altmap && !IS_ENABLED(CONFIG_SPARSEMEM_VMEMMAP)) {
- dev_err(dev, "%s: altmap requires CONFIG_SPARSEMEM_VMEMMAP=y\n",
- __func__);
- return ERR_PTR(-ENXIO);
- }
^ permalink raw reply [flat|nested] 2+ messages in thread
* [merged] mm-cleanup-ifdef-guards-for-vmem_altmap.patch removed from -mm tree
@ 2016-07-12 21:22 akpm
0 siblings, 0 replies; 2+ messages in thread
From: akpm @ 2016-07-12 21:22 UTC (permalink / raw)
To: dan.j.williams, jmoyer, sandeen, vbabka, mm-commits
The patch titled
From: Dan Williams <dan.j.williams@intel.com>
has been removed from the -mm tree. Its filename was
mm-cleanup-ifdef-guards-for-vmem_altmap.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: mm: cleanup ifdef guards for vmem_altmap
From: Dan Williams <dan.j.williams@intel.com>
Now that ZONE_DEVICE depends on SPARSEMEM_VMEMMAP we can simplify some
ifdef guards to just ZONE_DEVICE.
Link: http://lkml.kernel.org/r/146687646788.39261.8020536391978771940.stgit@dwillia2-desk3.amr.corp.intel.com
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Reported-by: Vlastimil Babka <vbabka@suse.cz>
Cc: Eric Sandeen <sandeen@redhat.com>
Cc: Jeff Moyer <jmoyer@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
include/linux/memremap.h | 2 +-
kernel/memremap.c | 8 --------
2 files changed, 1 insertion(+), 9 deletions(-)
diff -puN include/linux/memremap.h~mm-cleanup-ifdef-guards-for-vmem_altmap include/linux/memremap.h
--- a/include/linux/memremap.h~mm-cleanup-ifdef-guards-for-vmem_altmap
+++ a/include/linux/memremap.h
@@ -26,7 +26,7 @@ struct vmem_altmap {
unsigned long vmem_altmap_offset(struct vmem_altmap *altmap);
void vmem_altmap_free(struct vmem_altmap *altmap, unsigned long nr_pfns);
-#if defined(CONFIG_SPARSEMEM_VMEMMAP) && defined(CONFIG_ZONE_DEVICE)
+#ifdef CONFIG_ZONE_DEVICE
struct vmem_altmap *to_vmem_altmap(unsigned long memmap_start);
#else
static inline struct vmem_altmap *to_vmem_altmap(unsigned long memmap_start)
diff -puN kernel/memremap.c~mm-cleanup-ifdef-guards-for-vmem_altmap kernel/memremap.c
--- a/kernel/memremap.c~mm-cleanup-ifdef-guards-for-vmem_altmap
+++ a/kernel/memremap.c
@@ -308,12 +308,6 @@ void *devm_memremap_pages(struct device
if (is_ram == REGION_INTERSECTS)
return __va(res->start);
- if (altmap && !IS_ENABLED(CONFIG_SPARSEMEM_VMEMMAP)) {
- dev_err(dev, "%s: altmap requires CONFIG_SPARSEMEM_VMEMMAP=y\n",
- __func__);
- return ERR_PTR(-ENXIO);
- }
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-07-29 18:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-07-29 18:56 [merged] mm-cleanup-ifdef-guards-for-vmem_altmap.patch removed from -mm tree akpm
-- strict thread matches above, loose matches on Subject: below --
2016-07-12 21:22 akpm
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.