From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 13 Dec 2012 21:11:15 +0000 (-0800)
Subject: Merge branch 'akpm' (Andrew's patch-bomb)
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f6e858a00af788bab0fd4c0b7f5cd788000edc18;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'akpm' (Andrew's patch-bomb)

Merge misc VM changes from Andrew Morton:
 "The rest of most-of-MM.  The other MM bits await a slab merge.

  This patch includes the addition of a huge zero_page.  Not a
  performance boost but it an save large amounts of physical memory in
  some situations.

  Also a bunch of Fujitsu engineers are working on memory hotplug.
  Which, as it turns out, was badly broken.  About half of their patches
  are included here; the remainder are 3.8 material."

However, this merge disables CONFIG_MOVABLE_NODE, which was totally
broken.  We don't add new features with "default y", nor do we add
Kconfig questions that are incomprehensible to most people without any
help text.  Does the feature even make sense without compaction or
memory hotplug?

* akpm: (54 commits)
  mm/bootmem.c: remove unused wrapper function reserve_bootmem_generic()
  mm/memory.c: remove unused code from do_wp_page()
  asm-generic, mm: pgtable: consolidate zero page helpers
  mm/hugetlb.c: fix warning on freeing hwpoisoned hugepage
  hwpoison, hugetlbfs: fix RSS-counter warning
  hwpoison, hugetlbfs: fix "bad pmd" warning in unmapping hwpoisoned hugepage
  mm: protect against concurrent vma expansion
  memcg: do not check for mm in __mem_cgroup_count_vm_event
  tmpfs: support SEEK_DATA and SEEK_HOLE (reprise)
  mm: provide more accurate estimation of pages occupied by memmap
  fs/buffer.c: remove redundant initialization in alloc_page_buffers()
  fs/buffer.c: do not inline exported function
  writeback: fix a typo in comment
  mm: introduce new field "managed_pages" to struct zone
  mm, oom: remove statically defined arch functions of same name
  mm, oom: remove redundant sleep in pagefault oom handler
  mm, oom: cleanup pagefault oom handler
  memory_hotplug: allow online/offline memory to result movable node
  numa: add CONFIG_MOVABLE_NODE for movable-dedicated node
  mm, memcg: avoid unnecessary function call when memcg is disabled
  ...
---

f6e858a00af788bab0fd4c0b7f5cd788000edc18
diff --cc mm/Kconfig
index e6651c5de14f,1680a0123a13..71259e052ce8
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@@ -143,6 -143,14 +143,14 @@@ config NO_BOOTME
  config MEMORY_ISOLATION
  	boolean
  
+ config MOVABLE_NODE
+ 	boolean "Enable to assign a node which has only movable memory"
+ 	depends on HAVE_MEMBLOCK
+ 	depends on NO_BOOTMEM
+ 	depends on X86_64
+ 	depends on NUMA
 -	default y
++	depends on BROKEN
+ 
  # eventually, we can have this option just 'select SPARSEMEM'
  config MEMORY_HOTPLUG
  	bool "Allow for memory hot-add"