Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / arch / s390 / mm / init.c

diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c
index 2963b563621c29e345ca61541aaa472b453d9072..c3c07d3505ba17ebe953d4310508abeb6b63fba1 100644 (file)
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c
@@ -169,7 +169,7 @@ void __init free_initrd_mem(unsigned long start, unsigned long end)
 #endif
 
 #ifdef CONFIG_MEMORY_HOTPLUG
-int arch_add_memory(int nid, u64 start, u64 size)
+int arch_add_memory(int nid, u64 start, u64 size, bool for_device)
 {
        unsigned long normal_end_pfn = PFN_DOWN(memblock_end_of_DRAM());
        unsigned long dma_end_pfn = PFN_DOWN(MAX_DMA_ADDRESS);