From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754433AbcE0OIa (ORCPT ); Fri, 27 May 2016 10:08:30 -0400 Received: from mail-am1on0106.outbound.protection.outlook.com ([157.56.112.106]:5090 "EHLO emea01-am1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750727AbcE0OI3 (ORCPT ); Fri, 27 May 2016 10:08:29 -0400 Authentication-Results: linux-foundation.org; dkim=none (message not signed) header.d=none;linux-foundation.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Davydov To: Andrew Morton CC: Michal Hocko , Tetsuo Handa , , Subject: [PATCH] mm: zap ZONE_OOM_LOCKED Date: Fri, 27 May 2016 17:08:13 +0300 Message-ID: <1464358093-22663-1-git-send-email-vdavydov@virtuozzo.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [195.214.232.10] X-ClientProxiedBy: AM3PR03CA016.eurprd03.prod.outlook.com (10.141.191.144) To HE1PR08MB0587.eurprd08.prod.outlook.com (10.163.178.141) X-MS-Office365-Filtering-Correlation-Id: f813d351-5994-406f-61cd-08d386385bbf X-Microsoft-Exchange-Diagnostics: 1;HE1PR08MB0587;2:DDaAlzTtHMDzFivLPMmQSQPfKUMm1VyJ/Bqn/LSf1tc0tpxf7oja6wZQtxHeW3l4f+TsSCIISSbd8Lg4Rbgne5zj89PVNW3dyg+7BXEw6xhibE+jyo10Czs+t8mRpjxWFLTyOpTE18xg2+PI2fo2TDh6Ld1O1nYxPaEpaCT/pSeT0ySrihvDWnZ9sJQDYom0;3:JMgN3vchPYQ8hynG4ehsCMMXKCFK7XMXRyW21fMmTN2zv+FdugK0bgbki/dAwwKQY3VJNlWmz2fTPR8nphJthFvf8tTQBOPdENe+ULaN2TZqwhG4m69RJ/aacEy3Ra18;25:XdiGmRjwbrwpNM5b5syEqMmokGPGXRqnxiBWqjBmRHu3U3hx7FQmtQu1uJIRIdoDARuKuP3jno2QPTtuqVayXeC2QHkBC35v6t0VET/bryFtDRA1sV9P/nMuJlcSlqlzDmtMY9KFOpb0Np9E4YG0SKvaCgF2GALHiMDMkYF7JKUOh7PJWIvPmpkDrAS7e/dgwiD5MxIhrPVNc9bST8Sf91vW1sSh1Y+HYjTPXxHcXlqmuFbLOcD4GFIDqD/AoNvOVFCekwtNL0TTapP7O8deuywfx8uJX06by93ZElXMHLsfC+Nk+OmwldmpibQc6ysRGCwnFJCMzfFKMm2IdapBePcss3kH+eserirRmeW8PN7wk0j8rW8ZraeliS8stfAaNO2kPmkMO/VtJ9d2gJmCrHL3mUnOMlGIbIX6lXik7II= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HE1PR08MB0587; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040130)(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001)(6041072)(6043046);SRVR:HE1PR08MB0587;BCL:0;PCL:0;RULEID:;SRVR:HE1PR08MB0587; X-Microsoft-Exchange-Diagnostics: 1;HE1PR08MB0587;4:kcN5G/GERWP2hmFgqqQrhBPiIQkzZ1gaJ9TOn4Cmg3ZyNlU91cfZcDD0p0vRqmjH1vKF1da73tiCSj9N2zwYtzK5KAFQGAgE/yEIUlT1+ZlGrVAa/4Ayx7ogSqBK/P6uC/XTDxUQc4nTj6g2NfskGhvLausjNrScB5/OA+hMy7ZqzKyCuC1fJaflqdjA6y7aMNwRoMhFKtR3kBs3HWcFoTXQCKLy4NwB/cCgCZWM6YBjuk6O0zB44/cFKjiyXRtn2xEUaHZYXrp4DCu+Y2uLFrq+VqmD50k4m9Hr9FoGLB2MwlCwCxWJuHdgUtU0CNnC8sCk2IxOw2TTcbOpqMXyqdVnmtrI84+xnGv0YzOy5TVaBzpdkmHpDA1roQknbCGzrCzEw5znmo+L+FM6lU046HXsoUqs5fn9vTZurFtFhGg= X-Forefront-PRVS: 09555FB1AD X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6009001)(36756003)(50466002)(48376002)(50986999)(66066001)(47776003)(81166006)(8676002)(77096005)(50226002)(189998001)(80792005)(5004730100002)(110136002)(2906002)(586003)(3846002)(4326007)(6116002)(5008740100001)(5003940100001)(42186005)(33646002)(229853001)(92566002)(86362001)(19580395003)(19580405001);DIR:OUT;SFP:1102;SCL:1;SRVR:HE1PR08MB0587;H:virtuozzo.com;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;HE1PR08MB0587;23:6k/+0kmlRpARMWEI30VcF58whPQf0zgJmOCyFqtaQ8/W9bg5fGzDHnAyAV82Ug8C1kUX/NPZNyA7eT6M4rWEE3eTPmgDjhV95oilRc8HzS6IFNK8ZUOpGn0slltBSCKAO6au5zauhC2CX9fZSpOtGp9CN6V0DTgM5KwUQR8QefRBw+kOS3486w6dfAXoFpcLydcXJZd4h3hTMyCJylZTN1Scb5FSO0wsLKlwjL9ob8mkLJRFtZS/7J7UmXF5KMHG0kX/F4oYnR9p0+ciHLGaunYEOMf8G82zqPNkHBinAO29/gXZd5l8VVvH9nk7DGko/6jw3gS1BJp/IlZS3ADldJdlGD03d7NpdHmrqWHVpQ8qERRjYp2aE6a+wADDNF88zhj2Zwc8j70SCboO9pmGG/etCz3R/gz+dIfhPK/floYynGvk78nQ101o0hWtLBSw2ZOwIpFZZ0YVEg1yPNfSen/vziHkgPQivm5IYUaS9FMNzDwMGDS8WUJ9yoRVf9MaGjO1MyJvk/4cZNklwnaLWGj68g3zqBGL3Kaw4qqFqlzSutS9qsPgiCUV8htyHPGdPmhlCcBrZ28LZDQ+/BvKTfu8DY7GXefLA6FNty/rUIwKv4e3n/4PIgYL7GIam2IUatsKov8aPQHBiaojNv6nFuGS2F9ytjuk55mnd1Z0F4ZS+Su4HyVjMUbd2UkjgAIwra5qUY+rXLjUb6MK+7+CNzgtZzpCxSpCRI4OoNtGndij4CkWHPLkjna7UbgRX9r2+rBHDGNT/914mw/UfqVxcS3XVnZw+WKQqc65UrvKm3n75w9974GNSt3pFrG0kETQ1mYQ6aZ4AmdMgGgSGIHfHg== X-Microsoft-Exchange-Diagnostics: 1;HE1PR08MB0587;5:647v7lRwrT/pxCHerQuv5KemMiM8SgjGPMkTSHaFzqdEYhDwWHAJitgcIlEO/3gdJUUnSih/prKWHXguqxm2ALb7d4fr0UlAfJtUht+nJEWwUVrAz1HXBddJ0yw14JQXfainOW33qTqTpt+J+Xvtvw==;24:b4iqwQDUkotKUwDJC/1zFtlVUPrzh7He3hyHoy6fEW5lLdJNDgffSnDW5UUB5bpFDeEg9Oy7oL77BrzsbIq+DjyjGPzbHKvwBILZZ+s6Y/0=;7:5VaeNls1J7csNJona3cMadqgJOFGnENNpL8b727dQKO33WR5qCnMBxctT7Nes5bSQl0v5dHjom3auNbCg9Gt6CFewTrZxGo1qjfO9QWHyZBXMd0a5zhJ02G4fNsxhLkGKRbhpTSULx9V7mxTNXBZFzDXH00VltKUD5SJ+sLawjvA3as54VcwEYvvLWH3plND;20:Xr2GfhRJW2sPSCLMsYPqSDO9K3YeEIFdkdn62RySZ01x7ARS11NhgcT/xeVmn5o5552HEl57wDIzM3XScNrrKcIyXn8B4yN3jpU7fJFZuTxnROoUUb5SazrHlNgh2H1xCmb6Y0dFbD+Dcm5n7IvgNaHZLe8+HTCRrw75w2UXlXQ= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 May 2016 14:08:19.7431 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR08MB0587 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Not used since oom_lock was instroduced. Signed-off-by: Vladimir Davydov --- 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