aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/mm
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2007-07-27 06:29:13 -0400
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2007-07-27 06:29:18 -0400
commite62133b4ea0d85888d9883a3e1c396ea8717bc26 (patch)
tree72b5840c1ab1430518665dcb02532dc2edd44242 /arch/s390/mm
parent3b74a87422cc8d1062529b58bc3891383d138e5e (diff)
[S390] Get rid of new section mismatch warnings.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/mm')
-rw-r--r--arch/s390/mm/vmem.c6
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
30static LIST_HEAD(mem_segs); 30static LIST_HEAD(mem_segs);
31 31
32void memmap_init(unsigned long size, int nid, unsigned long zone, 32void __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
69static inline void *vmem_alloc_pages(unsigned int order) 69static 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);