From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id D0A65C3DA78 for ; Sun, 15 Jan 2023 00:17:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 269768E0002; Sat, 14 Jan 2023 19:17:21 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2196B8E0001; Sat, 14 Jan 2023 19:17:21 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0BAC48E0002; Sat, 14 Jan 2023 19:17:21 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id F14968E0001 for ; Sat, 14 Jan 2023 19:17:20 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id BA3EF40171 for ; Sun, 15 Jan 2023 00:17:20 +0000 (UTC) X-FDA: 80355119040.19.7DFC503 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10olkn2022.outbound.protection.outlook.com [40.92.42.22]) by imf01.hostedemail.com (Postfix) with ESMTP id 3F8224000E for ; Sun, 15 Jan 2023 00:17:17 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=outlook.com header.s=selector1 header.b=jod1he34; spf=pass (imf01.hostedemail.com: domain of bnrkreddy@outlook.com designates 40.92.42.22 as permitted sender) smtp.mailfrom=bnrkreddy@outlook.com; arc=pass ("microsoft.com:s=arcselector9901:i=1"); dmarc=pass (policy=none) header.from=outlook.com ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1673741837; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:in-reply-to: references:dkim-signature; bh=TgdVWnINzWyTRC7zJKeykID8BXl5BGy6jKJS8ZkxdzA=; b=g8AmRJpFtlX69G3nmVoTs5uVwPW4ORZzktVZNVCeH9ZUB7pSj0PEn0h+iXyR8IGnw3jYfm 4GNy0KBN4anuVHtd8cRH0x6c9nUVFEtZKWAsIsHhjTdqEEnTb1u5B4/LBEgNHMv8RlaZVR 79bF7QKT8CMClWlPQ8cGAR136L7aBU8= ARC-Authentication-Results: i=2; imf01.hostedemail.com; dkim=pass header.d=outlook.com header.s=selector1 header.b=jod1he34; spf=pass (imf01.hostedemail.com: domain of bnrkreddy@outlook.com designates 40.92.42.22 as permitted sender) smtp.mailfrom=bnrkreddy@outlook.com; arc=pass ("microsoft.com:s=arcselector9901:i=1"); dmarc=pass (policy=none) header.from=outlook.com ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1673741837; a=rsa-sha256; cv=pass; b=L+VRFsiqtBJNUbPM0iYn2lGIFqg9tUpNnDHvCrMtUWTwMibYsSsQG3hOkSHcGrBTihWnds WE2LEnYAB+xprPxaJGXbeRRcOI2UpNkHY3i6di+FV6f6VyxeLQbGb/7zQNLuF0yvvQpx1x 7+HC3x1Pe5k9zixL0Ob/y7Eq+ofMWeE= ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PjvS1jpdNHkJIPR6SWnLvpbVJieQYAmbMO0syJ00lPEk7A5092k3Lc634vKDpdg1Nmxly4pSV/XCeVCH2koOI+oDtBWsnvs/mQ0wOaWfZUj7xiR0hya++CX/gP/dNWgGXupn4+i6KDq6eMxKJ+/q+fldJLtNJiq9Lcd3fIcgtP1pmPOGv5idXXt9Iz6kZI34oVD5DUD40JMFMRvs/4w5A9hXE0J2bDu5QjmqcZe3Sef3kpPZc4FAXvrrxxSBZinUuzN8QYVolVSceWV+jPNb881sBbIdxfJs65kWMsALuHYFYnfLedUDSpoV+G9xMBQW4MF5IeenSIPkrsIG2Abftg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=TgdVWnINzWyTRC7zJKeykID8BXl5BGy6jKJS8ZkxdzA=; b=et0Fus4R0VNz0M7ZT4UVvvTgNVr0gdEnnkuJ7AGGLRBX2NMSTrM162tsQCtrFk4aTEo0smjgAlmoIYmsKymtZ8+cy8MIdLCjzkTxItCfVe2YzLOm2+d7T8J/rUhRi3kGYP3BK6il2C1GlaNA4m9964osXc3SQzRentwlpCO4TLbKNT3oacH3Jvbb2hHYwrcYSlUV5s1CEUeFq2i1x+vesXre8R+wB/wGfqwinYyVy/3EHoZDQSIdNxWT8LIqwCTW8uDYfMhfVnAmY/bpFrRtWCITdkq6cEjkPgk8WaLgngZ4Hu/9aBVKI7mI8MJaF2UGEWJc7S+uYhAuS0zy5nWQ/w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TgdVWnINzWyTRC7zJKeykID8BXl5BGy6jKJS8ZkxdzA=; b=jod1he34h+r7LwKm3vDWTz8glJCNmRyGkcJkh87RIx8oDEmKrFZ+r71r3xpfjpaKDgSvz0FigfaHIkO33w+D2biZsApM6G8jJ/81EledSvX+poRHxG7fJVQAWs407W+IffZZjojfsu0yAnjHeCX19eTEh+I5XpyOSRaYmkNlghr2CIRrkLA0BjsX6KPgEIqeYLdh6cDb6mg9oKeAlLeMLb3w7ag0Vckl6hY75wtp1FUotAroL/KinWQ1u0zzPlS4gyTSrXY2I+dD9iluPFBCF5LkpqlMQwjpdZZmF7Mfq/CvxvW5yrSqGLSzT8ggztVu264wJ0tjCU+5w9jZpndzIA== Received: from SA0PR03MB5388.namprd03.prod.outlook.com (2603:10b6:806:b7::12) by SJ0PR03MB6253.namprd03.prod.outlook.com (2603:10b6:a03:3b8::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5986.19; Sun, 15 Jan 2023 00:17:13 +0000 Received: from SA0PR03MB5388.namprd03.prod.outlook.com ([fe80::e908:cc8:888:7da]) by SA0PR03MB5388.namprd03.prod.outlook.com ([fe80::e908:cc8:888:7da%8]) with mapi id 15.20.6002.013; Sun, 15 Jan 2023 00:17:13 +0000 From: bnrkreddy@outlook.com To: linux-mm@kvack.org Cc: Ravi Kumar Reddy Subject: [PATCH] mm: Fix checkstyle warnings in mm/mmap.c Date: Sun, 15 Jan 2023 00:16:49 +0000 Message-ID: X-Mailer: git-send-email 2.31.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-TMN: [/EKdb9G3KKaLAzcQ6cmGyabGnin202sa] X-ClientProxiedBy: MN2PR01CA0020.prod.exchangelabs.com (2603:10b6:208:10c::33) To SA0PR03MB5388.namprd03.prod.outlook.com (2603:10b6:806:b7::12) X-Microsoft-Original-Message-ID: <20230115001649.29080-1-bnrkreddy@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA0PR03MB5388:EE_|SJ0PR03MB6253:EE_ X-MS-Office365-Filtering-Correlation-Id: 9ae10a2d-b1d0-41b8-6a22-08daf68dd9b6 X-MS-Exchange-SLBlob-MailProps: feAVlmA1hHXdDWhZiYn8VTFI/2xzDgHHfSvyHEyje33J4YghM1IJgEVNRu62Wy5zdxYRDoHwTUK88amWqbBYS/JxlmiUkGc+2Qu1yrSyg3WdeYc57rMLt6PhCTnltCWwj/NE47UR4W1vFrZklKf2rOHruLU+AHqXYx6i2hnNpK/FsN2uMkM3e8eLcYjXjd2lq7HRqrNbhoaVXt4qh3JUhW5NR6JHjPHH8hsuWGzEsfE2tjGDKPt/yuuZ3dPyBhlG2mx39Uf7S+AmDVtEVJn7nZbn2mXdujIBlkGwmMl3vK4yUTvqtu8fiG762fBorPvTpHvp1m1WwOi73ubb16nW8L7EgyTImV9JuqBhvC0OdwLHDjoPW/DPXpHeRnrerCNNYv7SOKNTdEll9pJeEvOncoaOInWzh0Bkez1/dmCE85QmYMAeQNdd9W23b1U5R75uhqzyiREzXzdGVrOHa3tnqfkFh8qK0kGpueUaBPzSalTjnWYc3I73v11kQJ8xXX7036+BitKMxWi4c1CePFalMaxTtFajPsDwpGUPzdWSLZM/AIGBo12JcX+05rtm600Z3JY+RXAJ/AznO0t/JDohwfOKP0BWbMqG6ADX8S6du8O4hLYp6XXT/6Jx6VhVEWV2f2BEPCYnuvnnF4xsp3LCp4JNrKcpqUa/xYSR+/zlstL0234KjGwloRjBTunjHlMvNlST9WSthEOg1WDi9WiKTw== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Cde/5WiEe7RmTTZLv/YwdZemyolPs0tLk4iHWFmqdQ+DqI6QX4bIq14HV1UwMJ0glLac7NELEsb0L700o7PNjDzCfjk/5PtsQ05SSsDI8t5p3lJedRw0ZFn2u85r+ZnDiOss4MEBERv3qxLiQFiVH5VPBMimZtKEEm3Lvt8oq6nTGklrP4qheWru2OwdekEUDIai7TddIjD6+gNtaTXOdAw6544zV7Rw0uLlU2lf3ehQn4li2d/V+4myUZjSpbAxgd8I8dnRQzT2BiCMWI07QhIcCco8vLnVlIzrQrhn9GNWznHX7DnEzjs/e9h5kxZj9FGoEGUt+eK4It5/Mmvf8SnBbSJLueiiQ0hNBd5NWHy69MZAwt5nQWeEMWDHZDZUYDVR3niv5hA1/GdIBpXUHSDd91maZv3bp+ZQgTjQ3LrFxgvxdoC6KWJR9ToKGxLsA9+99/LFsznmQslKJVv5XMRLunt25fowN5KoH/m4woUP1E8NqSipAQquq33WYB7yl9OdznCUyiZDL35XOe6lg06QnpJhmaqZnlH+bwS+jXTYStKQY8ngZVbopGFv8lUWxB+RlVqjEf+jkfIH4z/3UZNALpOL5MYhGhmWz8gn7dWj3+1mSyFCCDk7HXQS76YgmY6sbi7pZIuQ3MLHxlb4mg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?361x33a8nslffqnEzUOIyt1rapsuoVTWOPiaaQVx61I/maKFwbP682y7p1+X?= =?us-ascii?Q?UTNXFIqkviAbpxM1Wu2w1eQhivQlP90H8GnjntG0Ct9M71YdPKmQs8OGHNE7?= =?us-ascii?Q?yKTJyw9Yhy2z/XEPC7VoKQFp1Go+1oSBbIjK5h3/UV/+GWHrUAGGmBxhoHad?= =?us-ascii?Q?/n0kva1D/SFNVZTm1su7VJZiQYgC7/cLNlMbvPTb7GIIFo1dZ5U/WW4ulCCi?= =?us-ascii?Q?D02D+nsF4ryZSXmRvJ9SsXWBnfVStop2aC5caQ3TAJXrWqqobb6IJg7te/di?= =?us-ascii?Q?zAO32anacKOe0VdhF2FcTbqoKYtj4Y3kaQMiTAyc+qVPqLAlc7MgrJqekB39?= =?us-ascii?Q?6CDPA1hsQ0YbBtI/J3ZelRPbWhrdjyoI/9VgETbV4Z53T1+/lAYVUcBX/2O6?= =?us-ascii?Q?wux8sAdPEWY93xtVS3VBl8DHE9d2hFXQPGU6anrUjNWoQc1WgRMLvLO8hpRT?= =?us-ascii?Q?+2eyJ5aSXtyx1flo6juXc0RT0wMNLkzv6xXsHImmfgf1Bp0qElz3FkS/f5pH?= =?us-ascii?Q?H0dCjYch2PvabbElSrH6OtXrAvcJIAni3HbYnCAFVswORAZWyruzT5Om1Bf9?= =?us-ascii?Q?z6272FNF+g1dcXMQ0LPZOsyhBXTY5huObE1oSeFMYjWewrTDtsRhOhR8eodd?= =?us-ascii?Q?JUOmvlzpK0QJw0aXRUI9zzQ3dUZsXSliJzlUGVTI53/p4kpT1VTmwwzh8HfO?= =?us-ascii?Q?6spy+muZxtFfc3rDoiJjUY/QNjw8OWX9kzLEuIfaQdPJYbhJTdPVcchSrERN?= =?us-ascii?Q?cfeCTXVf4/CZaL0q2B/RolHJMaUCo4rTYeVf6dP7FfTD8EjAm3zU8tXaZZIT?= =?us-ascii?Q?XpjO9QYYbe5XmJ11eiJSqwBZU23BrF2CyXIINbOnhX/jgqtOUk9nQ0vkyjoM?= =?us-ascii?Q?ZIunrrMmYlIPP8XQJ1wIY/yXMwApdTlC2nIPjx6k4di0vxbkFwYd9upXtvlQ?= =?us-ascii?Q?0e5vg35b76xpBMNQk1Hz2VsU4eJdp0lyLfbFxqnr8ponFcCItTwu1ijpwrcJ?= =?us-ascii?Q?YdjhZ4Bvnf8a/IFlnkU+lzAkyP2cEKLnmi9Bgyqhu9EugYABwp+DBBQr2w9r?= =?us-ascii?Q?p0feBrPOhIu4hzQvGSdRTxxc3adREY15Hlgb0BFHzB66G8aMcJCUAILKgg+S?= =?us-ascii?Q?tL4dnWteIQzEsRV6rEZQPuZukzQSPxq2HGnEH2HmXG/eDM053SWFOvth2cq1?= =?us-ascii?Q?nYMzFwZzedlyxBJ4XbA63Fdf+MlA6w9SYleljvUSGj/6UHVH0xLF7Yk48qHp?= =?us-ascii?Q?hutOlzh+CtjGXa3ZWnVu8OPox9XkFhbJk42owbDMCg=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9ae10a2d-b1d0-41b8-6a22-08daf68dd9b6 X-MS-Exchange-CrossTenant-AuthSource: SA0PR03MB5388.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jan 2023 00:17:13.2278 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR03MB6253 X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 3F8224000E X-Stat-Signature: g3co4qun6w7jiy73739g8eg6tcbg3354 X-HE-Tag: 1673741837-37323 X-HE-Meta: U2FsdGVkX18HURJtXXI79qekkMdANydYk8ZIIPUR9sue1lUnG0O8Hsu+czHZQsdbp+umdNUFb07u0eSy011GyGHxUyInpXm7k/sucE3DLtAz10lC/2DEoVUSdytIfB6PXyC7BOLapaIJnEWw5bDG+/dTi+InJqRqPuOQxZvCDugDDKlKe3X00Y3LqFxQqf2TanjUXzqfpcW057QsQ2rMjlGp2YxcBL69Hd5/wJoHgpKJGfIEDohbhk2gE0LaP6Rb+Ji5Tvc4cbk6jH7C9jASWqLfsrmFEu5t5lqGBsHzaGu+ChOl8Z3Q1lDewsQctZ+H5f7lR7ZxYGBIDiwLbE++UJZwYVr39QnFDJ1SdiM6yzseLtvzFhsKhcpUs7DNA1PbjdNXiZSjgYEJyVoNUJdmC5Yy9MWXyAhi3vUyooOEFsGxHpdCIjok8cu5Y8nPuIpB8/Q/HEbxXUY0XfC1DG5343UyVdggl/vZlaMx/r9IvKCV1scWvoE6SnWHCQKg13gmj96NogLlUv+GOlvC1YWmAQImxB04IPhbx7EUhzuyssNIs1P+BeNp5cWKDItmRDqVtvpgw4T6JEOLVKs+AzQac+H+omJoOoKf+0ne8bYIqXscWZM62D2QGOSrw1mrJZ2fIgLSjqap7s2jk+Tha9lN0V3NhuJkpAetTUJ8c1n30J+S+JgQMseIJlkI+s692uWzkadzFyVZS8xgvg3vgJ6e3nM7DpkM4yCnYPSbNmaoFXo8Z9+ghklJTmutK691B7cqFKlQ9uGqdVtbIm2YtBtXW/OJg9+63EDv5oqNjVr9RUTvCXLAN5Cxm5qw3pq4d4z2aWfwyX841JsaYw0yOGtvzye/MYwXXrw21ICepaj/LjiPsU+jtwGxolyWgNQPdv+OMhybdPC08fGjNVfzl5G3uBE7MA8Cp/evu+wIrHAvLlD7yB8lCNH+1scs/I39xEYVdS1I2F9KC4wD5YrqKrC slVC2WmW Xjs1jn/3mcAfIPr4R9qyCiUN4RFdZTo1FqhYCLAVhJSpe6weig4rmbfGEKM7P2qPHMI1EbEcxs9isxwg= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Ravi Kumar Reddy - WARNING: Missing a blank line after declarations - WARNING: Use #include instead of - WARNING: externs should be avoided in .c files extern void mt_dump(const struct maple_tree *mt); - WARNING: braces {} are not necessary for single statement blocks - WARNING: Block comments use a trailing */ on a separate line - WARNING: function definition argument 'struct file *' should also have an identifier - WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable - WARNING: simple_strtoul is obsolete, use kstrtoul instead - WARNING: Comparisons should place the constant on the right side of the test Testing: kernel cmdline included with: stack_guard_gap=-1 kernel log: [ 0.018025] mmap: Invalid page count '-1' for stack gap protection Signed-off-by: Ravi Kumar Reddy --- mm/mmap.c | 45 ++++++++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index 87d929316d57..5d4b0d625607 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -48,9 +48,9 @@ #include #include -#include +#include #include -#include +#include #define CREATE_TRACE_POINTS #include @@ -124,6 +124,7 @@ void unlink_file_vma(struct vm_area_struct *vma) if (file) { struct address_space *mapping = file->f_mapping; + i_mmap_lock_write(mapping); __remove_shared_vm_struct(vma, file, mapping); i_mmap_unlock_write(mapping); @@ -281,9 +282,6 @@ SYSCALL_DEFINE1(brk, unsigned long, brk) } #if defined(CONFIG_DEBUG_VM_MAPLE_TREE) -extern void mt_validate(struct maple_tree *mt); -extern void mt_dump(const struct maple_tree *mt); - /* Validate the maple tree */ static void validate_mm_mt(struct mm_struct *mm) { @@ -572,9 +570,8 @@ inline int vma_expand(struct ma_state *mas, struct vm_area_struct *vma, } /* Expanding over the next vma */ - if (remove_next && file) { + if (remove_next && file) __remove_shared_vm_struct(next, file, mapping); - } if (anon_vma) { anon_vma_interval_tree_post_update_vma(vma); @@ -946,6 +943,7 @@ can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags, if (is_mergeable_vma(vma, file, vm_flags, vm_userfaultfd_ctx, anon_name) && is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) { pgoff_t vm_pglen; + vm_pglen = vma_pages(vma); if (vma->vm_pgoff + vm_pglen == vm_pgoff) return 1; @@ -1511,8 +1509,10 @@ int vma_wants_writenotify(struct vm_area_struct *vma, pgprot_t vm_page_prot) if (vm_ops && (vm_ops->page_mkwrite || vm_ops->pfn_mkwrite)) return 1; - /* The open routine did something to the protections that pgprot_modify - * won't preserve? */ + /* + * The open routine did something to the protections that pgprot_modify + * won't preserve? + */ if (pgprot_val(vm_page_prot) != pgprot_val(vm_pgprot_modify(vm_page_prot, vm_flags))) return 0; @@ -1755,10 +1755,12 @@ unsigned long get_unmapped_area(struct file *file, unsigned long addr, unsigned long len, unsigned long pgoff, unsigned long flags) { - unsigned long (*get_area)(struct file *, unsigned long, - unsigned long, unsigned long, unsigned long); + unsigned long (*get_area)(struct file *file, unsigned long addr, + unsigned long len, unsigned long pgoff, + unsigned long flags); unsigned long error = arch_mmap_check(addr, len, flags); + if (error) return error; @@ -1792,7 +1794,6 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len, error = security_mmap_addr(addr); return error ? error : addr; } - EXPORT_SYMBOL(get_unmapped_area); /** @@ -2079,11 +2080,16 @@ unsigned long stack_guard_gap = 256UL<vm_ops && vma->vm_ops->may_split) { @@ -3365,6 +3371,7 @@ static vm_fault_t special_mapping_fault(struct vm_fault *vmf) if (*pages) { struct page *page = *pages; + get_page(page); vmf->page = page; return 0; @@ -3714,12 +3721,12 @@ static int reserve_mem_notifier(struct notifier_block *nb, case MEM_ONLINE: /* Default max is 128MB. Leave alone if modified by operator. */ tmp = sysctl_user_reserve_kbytes; - if (0 < tmp && tmp < (1UL << 17)) + if (tmp > 0 && tmp < (1UL << 17)) init_user_reserve(); /* Default max is 8MB. Leave alone if modified by operator. */ tmp = sysctl_admin_reserve_kbytes; - if (0 < tmp && tmp < (1UL << 13)) + if (tmp > 0 && tmp < (1UL << 13)) init_admin_reserve(); break; -- 2.31.1