linux-next-rejects
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index 2179764..88c40ef 100644
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -38,6 +38,8 @@
select HAVE_PERF_EVENTS
select HAVE_SYSCALL_TRACEPOINTS
select IRQ_DOMAIN
+ select SPARSEMEM_STATIC if 32BIT
+ select GENERIC_ARCH_TOPOLOGY if SMP
select SPARSE_IRQ
select SYSCTL_EXCEPTION_TRACE
select HAVE_ARCH_TRACEHOOK
diff --git a/include/linux/memremap.h b/include/linux/memremap.h
index f6d8e7a..bd2e17f 100644
--- a/include/linux/memremap.h
+++ b/include/linux/memremap.h
@@ -122,6 +122,8 @@
}
#ifdef CONFIG_ZONE_DEVICE
+void *memremap_pages(struct dev_pagemap *pgmap, int nid);
+void memunmap_pages(struct dev_pagemap *pgmap);
bool pfn_zone_device_reserved(unsigned long pfn);
void *devm_memremap_pages(struct device *dev, struct dev_pagemap *pgmap);
void devm_memunmap_pages(struct device *dev, struct dev_pagemap *pgmap);
