Subject: [folded-merged] mm-memory-hotplug-fix-lowmem-count-overflow-when-offline-pages-fix.patch removed from -mm tree To: mhocko@xxxxxxx,kamezawa.hiroyu@xxxxxxxxxxxxxx,liwanp@xxxxxxxxxxxxxxxxxx,rientjes@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Wed, 03 Jul 2013 14:33:16 -0700 The patch titled Subject: mm-memory-hotplug-fix-lowmem-count-overflow-when-offline-pages-fix has been removed from the -mm tree. Its filename was mm-memory-hotplug-fix-lowmem-count-overflow-when-offline-pages-fix.patch This patch was dropped because it was folded into mm-memory-hotplug-fix-lowmem-count-overflow-when-offline-pages.patch ------------------------------------------------------ From: Michal Hocko <mhocko@xxxxxxx> Subject: mm-memory-hotplug-fix-lowmem-count-overflow-when-offline-pages-fix Fix CONFIG_HIGHMEM=n build Cc: Wanpeng Li <liwanp@xxxxxxxxxxxxxxxxxx> Cc: Michal Hocko <mhocko@xxxxxxx> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx> Cc: David Rientjes <rientjes@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/page_alloc.c | 2 ++ 1 file changed, 2 insertions(+) diff -puN mm/page_alloc.c~mm-memory-hotplug-fix-lowmem-count-overflow-when-offline-pages-fix mm/page_alloc.c --- a/mm/page_alloc.c~mm-memory-hotplug-fix-lowmem-count-overflow-when-offline-pages-fix +++ a/mm/page_alloc.c @@ -6185,8 +6185,10 @@ __offline_isolated_pages(unsigned long s list_del(&page->lru); rmv_page_order(page); zone->free_area[order].nr_free--; +#ifdef CONFIG_HIGHMEM if (PageHighMem(page)) totalhigh_pages -= 1 << order; +#endif for (i = 0; i < (1 << order); i++) SetPageReserved((page+i)); pfn += (1 << order); _ Patches currently in -mm which might be from mhocko@xxxxxxx are origin.patch mm-memcg-dont-take-task_lock-in-task_in_mem_cgroup.patch mm-vmscan-limit-the-number-of-pages-kswapd-reclaims-at-each-priority.patch mm-vmscan-obey-proportional-scanning-requirements-for-kswapd.patch mm-vmscan-flatten-kswapd-priority-loop.patch mm-vmscan-decide-whether-to-compact-the-pgdat-based-on-reclaim-progress.patch mm-vmscan-do-not-allow-kswapd-to-scan-at-maximum-priority.patch mm-vmscan-have-kswapd-writeback-pages-based-on-dirty-pages-encountered-not-priority.patch mm-vmscan-block-kswapd-if-it-is-encountering-pages-under-writeback.patch mm-vmscan-check-if-kswapd-should-writepage-once-per-pgdat-scan.patch mm-vmscan-move-logic-from-balance_pgdat-to-kswapd_shrink_zone.patch mm-vmscan-stall-page-reclaim-and-writeback-pages-based-on-dirty-writepage-pages-encountered-v3.patch mm-vmscan-stall-page-reclaim-after-a-list-of-pages-have-been-processed-v3.patch mm-vmscan-set-zone-flags-before-blocking.patch mm-vmscan-move-direct-reclaim-wait_iff_congested-into-shrink_list.patch mm-vmscan-treat-pages-marked-for-immediate-reclaim-as-zone-congestion.patch mm-vmscan-take-page-buffers-dirty-and-locked-state-into-account-v3.patch fs-nfs-inform-the-vm-about-pages-being-committed-or-unstable.patch memcg-update-todo-list-in-documentation.patch mm-memory-hotplug-fix-lowmem-count-overflow-when-offline-pages.patch mm-pageblock-remove-get-set_pageblock_flags.patch mm-hugetlb-remove-hugetlb_prefault.patch mm-hugetlb-use-already-exist-interface-huge_page_shift.patch mm-correctly-update-zone-managed_pages-fix-fix.patch mm-correctly-update-zone-managed_pages-fix-fix-fix.patch memcg-kconfig-info-update.patch mm-parisc-prepare-for-removing-num_physpages-and-simplify-mem_init.patch mm-unicore32-prepare-for-removing-num_physpages-and-simplify-mem_init.patch mm-parisc-prepare-for-killing-free_all_bootmem_node.patch mm-memcontrol-factor-out-reclaim-iterator-loading-and-updating.patch fs-execc-de_thread-use-change_pid-rather-than-detach_pid-attach_pid.patch kernel-forkc-copy_process-unify-clone_thread-or-thread_group_leader-code.patch kernel-forkc-copy_process-dont-add-the-uninitialized-child-to-thread-task-pid-lists.patch kernel-forkc-copy_process-consolidate-the-lockless-clone_thread-checks.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html