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

Commit b97fdef8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "Three fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mm: numa: disable change protection for vma(VM_HUGETLB)
  include/linux/dmapool.h: declare struct device
  mm: move zone lock to a different cache line than order-0 free page lists
parents 3afe9f84 6b79c57b

include/linux/dmapool.h

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 
#include <asm/io.h>

#include <asm/scatterlist.h>



struct device;



struct dma_pool *dma_pool_create(const char *name, struct device *dev, 

			size_t size, size_t align, size_t allocation);

include/linux/mmzone.h

+3 −4
Original line number Diff line number Diff line
@@ -474,16 +474,15 @@ struct zone { 
	unsigned long		wait_table_bits;



	ZONE_PADDING(_pad1_)



	/* Write-intensive fields used from the page allocator */

	spinlock_t		lock;



	/* free areas of different sizes */

	struct free_area	free_area[MAX_ORDER];



	/* zone flags, see below */

	unsigned long		flags;



	/* Write-intensive fields used from the page allocator */

	spinlock_t		lock;



	ZONE_PADDING(_pad2_)



	/* Write-intensive fields used by page reclaim */

kernel/sched/fair.c

+3 −1
Original line number Diff line number Diff line
@@ -2165,8 +2165,10 @@ void task_numa_work(struct callback_head *work) 
		vma = mm->mmap;

	}

	for (; vma; vma = vma->vm_next) {

		if (!vma_migratable(vma) || !vma_policy_mof(vma))

		if (!vma_migratable(vma) || !vma_policy_mof(vma) ||

			is_vm_hugetlb_page(vma)) {

			continue;

		}



		/*

		 * Shared library pages mapped by multiple processes are not