diff options
Diffstat (limited to 'arch/s390')
-rw-r--r-- | arch/s390/mm/init.c | 12 | ||||
-rw-r--r-- | arch/s390/mm/vmem.c | 4 |
2 files changed, 16 insertions, 0 deletions
diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c index ae672f41c464..49ce6bb2c641 100644 --- a/arch/s390/mm/init.c +++ b/arch/s390/mm/init.c | |||
@@ -228,4 +228,16 @@ int arch_add_memory(int nid, u64 start, u64 size) | |||
228 | vmem_remove_mapping(start, size); | 228 | vmem_remove_mapping(start, size); |
229 | return rc; | 229 | return rc; |
230 | } | 230 | } |
231 | |||
232 | #ifdef CONFIG_MEMORY_HOTREMOVE | ||
233 | int arch_remove_memory(u64 start, u64 size) | ||
234 | { | ||
235 | /* | ||
236 | * There is no hardware or firmware interface which could trigger a | ||
237 | * hot memory remove on s390. So there is nothing that needs to be | ||
238 | * implemented. | ||
239 | */ | ||
240 | return -EBUSY; | ||
241 | } | ||
242 | #endif | ||
231 | #endif /* CONFIG_MEMORY_HOTPLUG */ | 243 | #endif /* CONFIG_MEMORY_HOTPLUG */ |
diff --git a/arch/s390/mm/vmem.c b/arch/s390/mm/vmem.c index 79699f46a443..e21aaf4f5cb6 100644 --- a/arch/s390/mm/vmem.c +++ b/arch/s390/mm/vmem.c | |||
@@ -268,6 +268,10 @@ out: | |||
268 | return ret; | 268 | return ret; |
269 | } | 269 | } |
270 | 270 | ||
271 | void vmemmap_free(struct page *memmap, unsigned long nr_pages) | ||
272 | { | ||
273 | } | ||
274 | |||
271 | /* | 275 | /* |
272 | * Add memory segment to the segment list if it doesn't overlap with | 276 | * Add memory segment to the segment list if it doesn't overlap with |
273 | * an already present segment. | 277 | * an already present segment. |