• L
    Merge branch 'akpm' (Andrew's patch-bomb) · f6e858a0
    Linus Torvalds 提交于
    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
      ...
    f6e858a0
Kconfig 14.4 KB