diff options
Diffstat (limited to 'arch/s390/mm/vmem.c')
-rw-r--r-- | arch/s390/mm/vmem.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/s390/mm/vmem.c b/arch/s390/mm/vmem.c index 92a565190028..fd594d5fe142 100644 --- a/arch/s390/mm/vmem.c +++ b/arch/s390/mm/vmem.c | |||
@@ -29,8 +29,8 @@ struct memory_segment { | |||
29 | 29 | ||
30 | static LIST_HEAD(mem_segs); | 30 | static LIST_HEAD(mem_segs); |
31 | 31 | ||
32 | void memmap_init(unsigned long size, int nid, unsigned long zone, | 32 | void __meminit memmap_init(unsigned long size, int nid, unsigned long zone, |
33 | unsigned long start_pfn) | 33 | unsigned long start_pfn) |
34 | { | 34 | { |
35 | struct page *start, *end; | 35 | struct page *start, *end; |
36 | struct page *map_start, *map_end; | 36 | struct page *map_start, *map_end; |
@@ -66,7 +66,7 @@ void memmap_init(unsigned long size, int nid, unsigned long zone, | |||
66 | } | 66 | } |
67 | } | 67 | } |
68 | 68 | ||
69 | static inline void *vmem_alloc_pages(unsigned int order) | 69 | static void __init_refok *vmem_alloc_pages(unsigned int order) |
70 | { | 70 | { |
71 | if (slab_is_available()) | 71 | if (slab_is_available()) |
72 | return (void *)__get_free_pages(GFP_KERNEL, order); | 72 | return (void *)__get_free_pages(GFP_KERNEL, order); |