diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-10-09 02:50:10 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-10-09 02:50:10 -0400 |
| commit | fc8eaa85681fa72dc6a4e46f01c92e4fba83d0ab (patch) | |
| tree | b044fab426f2167ceeb37ed6fe58f7f11b10cebd /mm/page_alloc.c | |
| parent | 2cc81c6992248ea37d0241bc325977bab310bc3b (diff) | |
| parent | 49e00eee00612b1357596fed8a88b621a7648c14 (diff) | |
Merge branch 'x86/urgent' into x86/cache, to pick up dependent fix
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'mm/page_alloc.c')
| -rw-r--r-- | mm/page_alloc.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 89d2a2ab3fe6..706a738c0aee 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
| @@ -6197,8 +6197,6 @@ static unsigned long __init calc_memmap_size(unsigned long spanned_pages, | |||
| 6197 | static void pgdat_init_numabalancing(struct pglist_data *pgdat) | 6197 | static void pgdat_init_numabalancing(struct pglist_data *pgdat) |
| 6198 | { | 6198 | { |
| 6199 | spin_lock_init(&pgdat->numabalancing_migrate_lock); | 6199 | spin_lock_init(&pgdat->numabalancing_migrate_lock); |
| 6200 | pgdat->numabalancing_migrate_nr_pages = 0; | ||
| 6201 | pgdat->numabalancing_migrate_next_window = jiffies; | ||
| 6202 | } | 6200 | } |
| 6203 | #else | 6201 | #else |
| 6204 | static void pgdat_init_numabalancing(struct pglist_data *pgdat) {} | 6202 | static void pgdat_init_numabalancing(struct pglist_data *pgdat) {} |
