s390/mm: make memory_block_size_bytes available for !MEMORY_HOTPLUG
authorHeiko Carstens <heiko.carstens@de.ibm.com>
Mon, 13 Feb 2017 13:58:36 +0000 (14:58 +0100)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>
Fri, 17 Feb 2017 06:40:55 +0000 (07:40 +0100)
Fix this compile error for !MEMORY_HOTPLUG && NUMA:
arch/s390/built-in.o: In function `emu_setup_size_adjust':
arch/s390/numa/mode_emu.c:477: undefined reference to `memory_block_size_bytes'

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
arch/s390/mm/init.c

index ba0c8d18e10d4d4164f2562c61c2763cebf452dd..ee5066718b212b1319baf3ec2da51a5f43ae6ebc 100644 (file)
@@ -151,6 +151,15 @@ void __init free_initrd_mem(unsigned long start, unsigned long end)
 }
 #endif
 
+unsigned long memory_block_size_bytes(void)
+{
+       /*
+        * Make sure the memory block size is always greater
+        * or equal than the memory increment size.
+        */
+       return max_t(unsigned long, MIN_MEMORY_BLOCK_SIZE, sclp.rzm);
+}
+
 #ifdef CONFIG_MEMORY_HOTPLUG
 int arch_add_memory(int nid, u64 start, u64 size, bool for_device)
 {
@@ -194,15 +203,6 @@ int arch_add_memory(int nid, u64 start, u64 size, bool for_device)
        return rc;
 }
 
-unsigned long memory_block_size_bytes(void)
-{
-       /*
-        * Make sure the memory block size is always greater
-        * or equal than the memory increment size.
-        */
-       return max_t(unsigned long, MIN_MEMORY_BLOCK_SIZE, sclp.rzm);
-}
-
 #ifdef CONFIG_MEMORY_HOTREMOVE
 int arch_remove_memory(u64 start, u64 size)
 {