Skip to content

Commit e054637

Browse files
srikardIngo Molnar
authored andcommitted
mm, sched/numa: Remove remaining traces of NUMA rate-limiting
Remove the leftover pglist_data::numabalancing_migrate_lock and its initialization, we stopped using this lock with: efaffc5 ("mm, sched/numa: Remove rate-limiting of automatic NUMA balancing migration") [ mingo: Rewrote the changelog. ] Signed-off-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com> Acked-by: Mel Gorman <mgorman@techsingularity.net> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Linux-MM <linux-mm@kvack.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Rik van Riel <riel@surriel.com> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/1538824999-31230-1-git-send-email-srikar@linux.vnet.ibm.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
1 parent 0238df6 commit e054637

File tree

2 files changed

+0
-14
lines changed

2 files changed

+0
-14
lines changed

include/linux/mmzone.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -667,10 +667,6 @@ typedef struct pglist_data {
667667
enum zone_type kcompactd_classzone_idx;
668668
wait_queue_head_t kcompactd_wait;
669669
struct task_struct *kcompactd;
670-
#endif
671-
#ifdef CONFIG_NUMA_BALANCING
672-
/* Lock serializing the migrate rate limiting window */
673-
spinlock_t numabalancing_migrate_lock;
674670
#endif
675671
/*
676672
* This is a per-node reserve of pages that are not available

mm/page_alloc.c

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6193,15 +6193,6 @@ static unsigned long __init calc_memmap_size(unsigned long spanned_pages,
61936193
return PAGE_ALIGN(pages * sizeof(struct page)) >> PAGE_SHIFT;
61946194
}
61956195

6196-
#ifdef CONFIG_NUMA_BALANCING
6197-
static void pgdat_init_numabalancing(struct pglist_data *pgdat)
6198-
{
6199-
spin_lock_init(&pgdat->numabalancing_migrate_lock);
6200-
}
6201-
#else
6202-
static void pgdat_init_numabalancing(struct pglist_data *pgdat) {}
6203-
#endif
6204-
62056196
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
62066197
static void pgdat_init_split_queue(struct pglist_data *pgdat)
62076198
{
@@ -6226,7 +6217,6 @@ static void __meminit pgdat_init_internals(struct pglist_data *pgdat)
62266217
{
62276218
pgdat_resize_init(pgdat);
62286219

6229-
pgdat_init_numabalancing(pgdat);
62306220
pgdat_init_split_queue(pgdat);
62316221
pgdat_init_kcompactd(pgdat);
62326222

0 commit comments

Comments
 (0)