Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[~andy/linux] / arch / s390 / mm / vmem.c

diff --git a/arch/s390/mm/vmem.c b/arch/s390/mm/vmem.c
index 92a565190028618e603a067802faa4c7a4caabe3..fd594d5fe142bed0d1f1f17256ee4f98d617ce14 100644 (file)
--- a/arch/s390/mm/vmem.c
+++ b/arch/s390/mm/vmem.c
@@ -29,8 +29,8 @@ struct memory_segment {
 
 static LIST_HEAD(mem_segs);
 
-void memmap_init(unsigned long size, int nid, unsigned long zone,
-                unsigned long start_pfn)
+void __meminit memmap_init(unsigned long size, int nid, unsigned long zone,
+                          unsigned long start_pfn)
 {
        struct page *start, *end;
        struct page *map_start, *map_end;
@@ -66,7 +66,7 @@ void memmap_init(unsigned long size, int nid, unsigned long zone,
        }
 }
 
-static inline void *vmem_alloc_pages(unsigned int order)
+static void __init_refok *vmem_alloc_pages(unsigned int order)
 {
        if (slab_is_available())
                return (void *)__get_free_pages(GFP_KERNEL, order);