The patch titled Subject: mm-memcontrol-rewrite-charge-api-fix-2 has been added to the -mm tree. Its filename is mm-memcontrol-rewrite-charge-api-fix-2.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-memcontrol-rewrite-charge-api-fix-2.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-memcontrol-rewrite-charge-api-fix-2.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: mm-memcontrol-rewrite-charge-api-fix-2 fix CONFIG_MMU=n build Cc: Johannes Weiner <hannes@xxxxxxxxxxx> Cc: Wu Fengguang <fengguang.wu@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/swap.c | 2 ++ 1 file changed, 2 insertions(+) diff -puN mm/swap.c~mm-memcontrol-rewrite-charge-api-fix-2 mm/swap.c --- a/mm/swap.c~mm-memcontrol-rewrite-charge-api-fix-2 +++ a/mm/swap.c @@ -716,6 +716,7 @@ void lru_cache_add_active_or_unevictable return; } +#ifdef CONFIG_MMU if (!TestSetPageMlocked(page)) { /* * We use the irq-unsafe __mod_zone_page_stat because this @@ -726,6 +727,7 @@ void lru_cache_add_active_or_unevictable hpage_nr_pages(page)); count_vm_event(UNEVICTABLE_PGMLOCKED); } +#else add_page_to_unevictable_list(page); } _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are i-need-old-gcc.patch arch-alpha-kernel-systblss-remove-debug-check.patch maintainers-akpm-maintenance.patch cpu-hotplug-smp-flush-any-pending-ipi-callbacks-before-cpu-offline.patch hugetlb-fix-copy_hugetlb_page_range-to-handle-migration-hwpoisoned-entry-checkpatch-fixes.patch kernel-watchdogc-print-traces-for-all-cpus-on-lockup-detection-fix.patch mm-thp-fix-debug_pagealloc-oops-in-copy_page_rep-checkpatch-fixes.patch shmem-fix-faulting-into-a-hole-while-its-punched-checkpatch-fixes.patch ocfs2-do-not-return-dlm_migrate_response_mastery_ref-to-avoid-endlessloop-during-umount.patch ia64-arch-ia64-include-uapi-asm-fcntlh-needs-personalityh.patch kernel-posix-timersc-code-clean-up-checkpatch-fixes.patch input-route-kbd-leds-through-the-generic-leds-layer.patch ocfs2-free-inode-when-i_count-becomes-zero-checkpatch-fixes.patch mm.patch slub-use-new-node-functions-checkpatch-fixes.patch slab-use-get_node-and-kmem_cache_node-functions-fix-2.patch slab-use-get_node-and-kmem_cache_node-functions-fix-2-fix.patch mm-page_allocc-unexport-alloc_pages_exact_nid.patch dma-cma-support-arbitrary-bitmap-granularity-fix.patch mm-hugetlbfs-fix-rmapping-for-anonymous-hugepages-with-page_pgoff-v3-fix.patch mm-memcontrol-rewrite-charge-api-fix.patch mm-memcontrol-rewrite-charge-api-fix-2.patch mm-memcontrol-rewrite-uncharge-api-fix.patch mm-introduce-do_shared_fault-and-drop-do_fault-fix-fix.patch mm-compactionc-isolate_freepages_block-small-tuneup.patch do_shared_fault-check-that-mmap_sem-is-held.patch list-fix-order-of-arguments-for-hlist_add_after_rcu-checkpatch-fixes.patch add-lib-globc-fix.patch fs-isofs-logging-clean-up-fix.patch linux-next.patch drivers-gpio-gpio-zevioc-fix-build.patch mm-replace-remap_file_pages-syscall-with-emulation-fix.patch memcg-deprecate-memoryforce_empty-knob-fix.patch debugging-keep-track-of-page-owners.patch journal_add_journal_head-debug.patch journal_add_journal_head-debug-fix.patch kernel-forkc-export-kernel_thread-to-modules.patch mutex-subsystem-synchro-test-module.patch slab-leaks3-default-y.patch put_bh-debug.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