projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-4.3/sg' of git://git.kernel.dk/linux-block
[firefly-linux-kernel-4.4.55.git]
/
mm
/
sparse.c
diff --git
a/mm/sparse.c
b/mm/sparse.c
index 63c3ea5c119c41f62d28b05e99ba4d7882241766..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/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 <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>
#include "internal.h"
#include <asm/dma.h>
#include <asm/pgalloc.h>
@@
-268,7
+270,7
@@
sparse_early_usemaps_alloc_pgdat_section(struct pglist_data *pgdat,
/*
* A page may contain usemaps for other sections preventing the
* page being freed and making a section unremovable while
/*
* A page may contain usemaps for other sections preventing the
* page being freed and making a section unremovable while
- * other sections referencing the usemap re
t
main active. Similarly,
+ * other sections referencing the usemap remain active. Similarly,
* a pgdat can prevent a section being removed. If section A
* contains a pgdat and section B contains the usemap, both
* sections become inter-dependent. This allocates usemaps
* a pgdat can prevent a section being removed. If section A
* contains a pgdat and section B contains the usemap, both
* sections become inter-dependent. This allocates usemaps
@@
-461,7
+463,7
@@
static struct page __init *sparse_early_mem_map_alloc(unsigned long pnum)
}
#endif
}
#endif
-void __
attribute__((weak))
__meminit vmemmap_populate_print_last(void)
+void __
weak
__meminit vmemmap_populate_print_last(void)
{
}
{
}