projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'nfsd-4.8' of git://linux-nfs.org/~bfields/linux
[linux-2.6-block.git]
/
mm
/
page_alloc.c
diff --git
a/mm/page_alloc.c
b/mm/page_alloc.c
index ea759b9353603bcea22bf77fb5fef633877c4a22..39a372a2a1d628a58eb5f02d3a27b3e0989b37f9 100644
(file)
--- a/
mm/page_alloc.c
+++ b/
mm/page_alloc.c
@@
-5276,7
+5276,7
@@
void __init setup_per_cpu_pageset(void)
setup_zone_pageset(zone);
}
setup_zone_pageset(zone);
}
-static noinline __
init_refok
+static noinline __
ref
int zone_wait_table_init(struct zone *zone, unsigned long zone_size_pages)
{
int i;
int zone_wait_table_init(struct zone *zone, unsigned long zone_size_pages)
{
int i;
@@
-5903,7
+5903,7
@@
static void __paginginit free_area_init_core(struct pglist_data *pgdat)
}
}
}
}
-static void __
init_refok
alloc_node_mem_map(struct pglist_data *pgdat)
+static void __
ref
alloc_node_mem_map(struct pglist_data *pgdat)
{
unsigned long __maybe_unused start = 0;
unsigned long __maybe_unused offset = 0;
{
unsigned long __maybe_unused start = 0;
unsigned long __maybe_unused offset = 0;