On Fri 27-05-16 17:08:13, Vladimir Davydov wrote:
> Not used since oom_lock was instroduced.
>
> Signed-off-by: Vladimir Davydov <vdavydov@xxxxxxxxxxxxx>
Acked-by: Michal Hocko <mhocko@xxxxxxxx>
> ---
> include/linux/mmzone.h | 1 -
> mm/oom_kill.c | 4 ++--
> 2 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
> index 02069c23486d..3388ccbab7d6 100644
> --- a/include/linux/mmzone.h
> +++ b/include/linux/mmzone.h
> @@ -524,7 +524,6 @@ struct zone {
>
> enum zone_flags {
> ZONE_RECLAIM_LOCKED, /* prevents concurrent reclaim */
> - ZONE_OOM_LOCKED, /* zone is in OOM killer zonelist */
> ZONE_CONGESTED, /* zone has many dirty pages backed by
> * a congested BDI
> */
> diff --git a/mm/oom_kill.c b/mm/oom_kill.c
> index 1685890d424e..b95c4c101b35 100644
> --- a/mm/oom_kill.c
> +++ b/mm/oom_kill.c
> @@ -997,8 +997,8 @@ bool out_of_memory(struct oom_control *oc)
>
> /*
> * The pagefault handler calls here because it is out of memory, so kill a
> - * memory-hogging task. If any populated zone has ZONE_OOM_LOCKED set, a
> - * parallel oom killing is already in progress so do nothing.
> + * memory-hogging task. If oom_lock is held by somebody else, a parallel oom
> + * killing is already in progress so do nothing.
> */
> void pagefault_out_of_memory(void)
> {
> --
> 2.1.4
--
Michal Hocko
SUSE Labs
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>