Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a22dd362 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Ingo writes:
  "scheduler fix:

   Cleanup of dead code left over from the recent sched/numa fixes."

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  mm, sched/numa: Remove remaining traces of NUMA rate-limiting
parents 6302aad4 e0546375

include/linux/mmzone.h

+0 −4
Original line number Diff line number Diff line
@@ -667,10 +667,6 @@ typedef struct pglist_data { 
	enum zone_type kcompactd_classzone_idx;

	wait_queue_head_t kcompactd_wait;

	struct task_struct *kcompactd;

#endif

#ifdef CONFIG_NUMA_BALANCING

	/* Lock serializing the migrate rate limiting window */

	spinlock_t numabalancing_migrate_lock;

#endif

	/*

	 * This is a per-node reserve of pages that are not available

mm/page_alloc.c

+0 −10
Original line number Diff line number Diff line
@@ -6193,15 +6193,6 @@ static unsigned long __init calc_memmap_size(unsigned long spanned_pages, 
	return PAGE_ALIGN(pages * sizeof(struct page)) >> PAGE_SHIFT;

}



#ifdef CONFIG_NUMA_BALANCING

static void pgdat_init_numabalancing(struct pglist_data *pgdat)

{

	spin_lock_init(&pgdat->numabalancing_migrate_lock);

}

#else

static void pgdat_init_numabalancing(struct pglist_data *pgdat) {}

#endif



#ifdef CONFIG_TRANSPARENT_HUGEPAGE

static void pgdat_init_split_queue(struct pglist_data *pgdat)

{
@@ -6226,7 +6217,6 @@ static void __meminit pgdat_init_internals(struct pglist_data *pgdat) 
{

	pgdat_resize_init(pgdat);



	pgdat_init_numabalancing(pgdat);

	pgdat_init_split_queue(pgdat);

	pgdat_init_kcompactd(pgdat);