Merge remote-tracking branch 'asoc/fix/cirrus' into asoc-linus

[firefly-linux-kernel-4.4.55.git] / mm / sparse.c

diff --git a/mm/sparse.c b/mm/sparse.c
index 38cad8fd739734573ce90a3c9b1c251116f01193..d1b48b691ac8c20040a262337cc7e0cbf566420f 100644 (file)
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -5,10 +5,12 @@
 #include <linux/slab.h>
 #include <linux/mmzone.h>
 #include <linux/bootmem.h>
+#include <linux/compiler.h>
 #include <linux/highmem.h>
 #include <linux/export.h>
 #include <linux/spinlock.h>
 #include <linux/vmalloc.h>
+
 #include "internal.h"
 #include <asm/dma.h>
 #include <asm/pgalloc.h>
@@ -461,7 +463,7 @@ static struct page __init *sparse_early_mem_map_alloc(unsigned long pnum)
 }
 #endif
 
-void __attribute__((weak)) __meminit vmemmap_populate_print_last(void)
+void __weak __meminit vmemmap_populate_print_last(void)
 {
 }