diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2017-10-06 11:46:32 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2017-10-06 11:46:55 +0200 |
| commit | 753d179ad001b25425beb977d00f2531540e7d42 (patch) | |
| tree | de61b9e3c86b71e9a654cea002b188f90b1f8ef6 /mm/page_alloc.c | |
| parent | 503c1fb98ba3859c13863957c7c65c92371a9e50 (diff) | |
| parent | cc71b7b071192ac1c288e272fdc3f3877eb96663 (diff) | |
| download | linux-753d179ad001b25425beb977d00f2531540e7d42.tar.gz linux-753d179ad001b25425beb977d00f2531540e7d42.tar.xz | |
Merge remote-tracking branch 'net-next/master' into mac80211-next
Merging this brings in the timer_setup() change, which allows
me to apply Kees's mac80211 changes for it.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'mm/page_alloc.c')
| -rw-r--r-- | mm/page_alloc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index c841af88836a..77e4d3c5c57b 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1190,7 +1190,7 @@ static void __meminit __init_single_pfn(unsigned long pfn, unsigned long zone, } #ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT -static void init_reserved_page(unsigned long pfn) +static void __meminit init_reserved_page(unsigned long pfn) { pg_data_t *pgdat; int nid, zid; @@ -5367,6 +5367,7 @@ not_early: __init_single_page(page, pfn, zone, nid); set_pageblock_migratetype(page, MIGRATE_MOVABLE); + cond_resched(); } else { __init_single_pfn(pfn, zone, nid); } |