The patch titled Subject: mm-oom_reaper-report-success-failure-v6 has been added to the -mm tree. Its filename is mm-oom_reaper-report-success-failure-v6.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-oom_reaper-report-success-failure-v6.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-oom_reaper-report-success-failure-v6.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: Michal Hocko <mhocko@xxxxxxxx> Subject: mm-oom_reaper-report-success-failure-v6 Signed-off-by: Michal Hocko <mhocko@xxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/oom_kill.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff -puN mm/oom_kill.c~mm-oom_reaper-report-success-failure-v6 mm/oom_kill.c --- a/mm/oom_kill.c~mm-oom_reaper-report-success-failure-v6 +++ a/mm/oom_kill.c @@ -410,8 +410,6 @@ static DECLARE_WAIT_QUEUE_HEAD(oom_victi bool oom_killer_disabled __read_mostly; -#define K(x) ((x) << (PAGE_SHIFT-10)) - #ifdef CONFIG_MMU /* * OOM Reaper kernel thread which tries to reap the memory used by the OOM @@ -421,6 +419,7 @@ static struct task_struct *oom_reaper_th static struct task_struct *task_to_reap; static DECLARE_WAIT_QUEUE_HEAD(oom_reaper_wait); +#define K(x) ((x) << (PAGE_SHIFT-10)) static bool __oom_reap_task(struct task_struct *tsk) { struct mmu_gather tlb; _ Patches currently in -mm which might be from mhocko@xxxxxxxx are mm-oom-introduce-oom-reaper.patch oom-reaper-handle-mlocked-pages.patch oom-clear-tif_memdie-after-oom_reaper-managed-to-unmap-the-address-space.patch mm-oom_reaper-report-success-failure.patch mm-oom_reaper-report-success-failure-v6.patch mm-oom_reaper-implement-oom-victims-queuing.patch mm-oom_reaper-implement-oom-victims-queuing-v6.patch oom-oom_reaper-disable-oom_reaper-for-oom_kill_allocating_task.patch oom-make-oom_reaper-freezable.patch mm-oom-rework-oom-detection.patch mm-throttle-on-io-only-when-there-are-too-many-dirty-and-writeback-pages.patch mm-use-watermak-checks-for-__gfp_repeat-high-order-allocations.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