From patchwork Thu Nov 3 02:51:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Huang Shijie X-Patchwork-Id: 9410077 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3022D601C2 for ; Thu, 3 Nov 2016 02:54:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 21CC72A5E7 for ; Thu, 3 Nov 2016 02:54:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0BC8C2A601; Thu, 3 Nov 2016 02:54:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 391EC2A5E7 for ; Thu, 3 Nov 2016 02:54:46 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1c289M-0003Hc-3z; Thu, 03 Nov 2016 02:53:08 +0000 Received: from mail-ve1eur01on0085.outbound.protection.outlook.com ([104.47.1.85] helo=EUR01-VE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1c288z-000368-Mo for linux-arm-kernel@lists.infradead.org; Thu, 03 Nov 2016 02:52:48 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector1-arm-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=cFt+AumQDlN5N1mtqdpU951y6ql3xjcw03T1bVZN+sc=; b=PEZE1pMpYE7w/ILzN11tmfVnw4AqhCRRTtO5cy8I16kP1XM+uhSS7i1nINt30KA9hflwvFnfZOG5gKAol+9xxaMUFmdLKDi6I/CAbaLADd8b9Y/wg2WArYFXnRfjPMD14gXSfumBdro1DlnwlMV/w37XN4vMpQ+fbR7sWjXQ2cM= Received: from AM4PR08CA0040.eurprd08.prod.outlook.com (10.166.127.50) by DB6PR0802MB2568.eurprd08.prod.outlook.com (10.172.252.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.693.12; Thu, 3 Nov 2016 02:52:17 +0000 Received: from AM1FFO11FD006.protection.gbl (2a01:111:f400:7e00::163) by AM4PR08CA0040.outlook.office365.com (2603:10a6:200:1a::50) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.693.12 via Frontend Transport; Thu, 3 Nov 2016 02:52:18 +0000 Authentication-Results: spf=pass (sender IP is 217.140.96.140) smtp.mailfrom=arm.com; oracle.com; dkim=none (message not signed) header.d=none;oracle.com; dmarc=bestguesspass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 217.140.96.140 as permitted sender) receiver=protection.outlook.com; client-ip=217.140.96.140; helo=nebula.arm.com; Received: from nebula.arm.com (217.140.96.140) by AM1FFO11FD006.mail.protection.outlook.com (10.174.64.68) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.693.6 via Frontend Transport; Thu, 3 Nov 2016 02:52:17 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:; UpperCasedChecksum:; SizeAsReceived:1078; Count:13 Received: from ent-kernel-softiron-01.shanghai.arm.com (10.1.2.79) by mail.arm.com (10.1.106.66) with Microsoft SMTP Server id 14.3.294.0; Thu, 3 Nov 2016 02:52:13 +0000 From: Huang Shijie To: , Subject: [PATCH 1/2] mm: hugetlb: rename some allocation functions Date: Thu, 3 Nov 2016 10:51:37 +0800 Message-ID: <1478141499-13825-2-git-send-email-shijie.huang@arm.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1478141499-13825-1-git-send-email-shijie.huang@arm.com> References: <1478141499-13825-1-git-send-email-shijie.huang@arm.com> MIME-Version: 1.0 X-IncomingHeaderCount: 13 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:217.140.96.140; IPV:CAL; SCL:-1; CTRY:GB; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(2980300002)(438002)(189002)(199003)(92566002)(2906002)(19580405001)(5003940100001)(189998001)(19580395003)(4326007)(7846002)(104016004)(586003)(8936002)(6666003)(50226002)(87936001)(86362001)(5660300001)(2950100002)(6636002)(106466001)(8676002)(229853001)(76176999)(50986999)(356003)(305945005)(626004)(33646002)(5001770100001)(47776003)(246002)(26826002)(50466002)(36756003)(77096005)(48376002); DIR:OUT; SFP:1101; SCL:1; SRVR:DB6PR0802MB2568; H:nebula.arm.com; FPR:; SPF:Pass; PTR:fw-tnat.cambridge.arm.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; AM1FFO11FD006; 1:KLDWnJpz18vhTV+wqZq+rT1jJhY6/vodxJgzx0NAJP0sdA7UC+RVxD+9cQ3GWk/YhFdzf6BeQV+osafBIOf+u5JhNHSqBR15AYV924n9FJp9L3k3Ch3W0FyizKR6GFRVDnpjUAz919SfqSTiFFlzfXHZePgflhS1pDoD0/jGjRjHIi1xLMVVtP9sKkPSbn89P6RaeHNweiCrG2MPt5DMt3l1W9rmi30sDVlHbEi8Fk2bpnixPi4DBwPxX0HbSZBUQvZkPbcxfBapbGmialEL6TwIoIg1AVQX4NrxDq1xIs/Kb/PEjwOKXKqrmgrlmvpO/UC3G2pzjnQOaL7+W9JSCTmGVEaMe3eTglPOWwkqZYnEHUN6uTQLkC++dJNoxRsLO5Sb+7cRQvFqqdx4UbyluOL9uTbSyQOTP8ltIaq7K98te8r6G1jXpKWkjfDxkc0HlUM6ATB30Y7MA7fPBzwphHlCzS6rJKncVKVwBpogAuGuXekDIRsz4R6Ifhyon7L03By+iAPaIGKsyLT2LifFaezcfoIM2kgCmBwbbEkr2WcxBOv/G6ddADN8/eFtJskWRUw1DSYGVGLxC8ZsewM+8A5VUqJVstY9SRzPigWz5Ih6QumDG1+dOAVYNNwEL7R7D3npunFZDnFbPrG4cf6wU34mc4zcxf5OVieKGvQV4Mw= X-MS-Office365-Filtering-Correlation-Id: ad944237-8b69-4cb9-6d33-08d403946c7c X-Microsoft-Exchange-Diagnostics: 1; DB6PR0802MB2568; 2:avQvAQjX7FHn2Bvld2IXiy7oE+5/6gWEdj8Q+4oiLyngOh1t/hvFscmcv8eCrCa2yzMT+cTNfBC04QpODvR/FZOhN2Tr1rZ7c/s/YfVu7ArBxVKTEOOI1zuSA8WND36ZzZ+pSgRsM6c9eHIUYxMDuarSeQ7oxe4knNVQzaN/NMznpP0+jlmgVNKmM5Upd6zy1q5zEs+tNw+dm9Ncki4Nfw==; 3:rqC1RqRqI1mjh6BojlVaYfSRUoRet/4hteLVWPW5qZC6jxKeJ9LJi5P1BRCqmHcKmdSW13sD+fRFY2Niw4z1/P+rnIIrYnhq7DIc0WET/g+Eppr6BA5IOqBgHPn13Sbg09qO0Fn7CUeYLWFi69VwSHkIF+gqLoGu/yEtAWEoUZLEtk2iYOi7RE0E3exIJTZtuPUTUX6BSO79XrX47i2c/rkK1P5dugxlYsdZ/RdZXgrgEdV3dXdRdBCkKwveRbot9BLF0rjUFpClT9/5cVxB2lY2PfeM9aTJqbyI8+5erGY= X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(8251501002); SRVR:DB6PR0802MB2568; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0802MB2568; 25:48U+LtdYrxmxPPwEh2xsWgUkGponsMAuCveq96u3lbWq3Hn16Ouf05EIIuUMn0EJzuqXb/fyuZTD8SVMgVOxibaQmmbmc+eaSpC8J5zTUvRhcxXU3khopPXKykWXZiTUzwCKTbjaOuyAkFKgOYATiO2MfXfQzUHKf3I26Nph8uzNBh+pDILL1WdqNEdRIgGHfeEkJtkidDD+u1NmURI8ERrePVXf0tZfcf76P1BXQwP15rhFvuizZlEzTdzHjtnnsmPM+gA/0SwsOOohoGMm9Tl3qyIjlsVCCQQe79lsMqQc211oUzHxtDJzgtGiP08IM1TKbWoTF9BF35GhDXPvhaRKI6KVMLHc1I0q61aCDjWC42B1Y80bx67rpGk4HRzKAF0yENrzKIyN1w+x7h/0PEcP4nyBPQLPmz+xpv8Z2s8=; 31:wKexlt3gDshh8Uw9mWklbnMhQ4xDZOpLnFbhlwClfW0lHOdJz7b8Yi5z52B/kftZo+1mxXHbKKYXrNxpAZOyExmCc7CW7vvZJQcBev26qn66QJvI3MLBj/vF910Hq+dx0f56Uc2ZqWzEZIiAuMX5EM6x35wxUkAWkEDwh7478S/EcvIMBUI3CZztnKg8FeAl2PJjuuwPMOokIyhMjetbVM5/ggArZ2Z15AMBk9PmHBZZsy3DZ/dKWKM2PWvFhUMm NoDisclaimer: True X-Microsoft-Exchange-Diagnostics: 1; DB6PR0802MB2568; 20:xT+HDv99Mt8sXzBB+9dRG9VOn0zBhRBSGI3UtYkzclK7iwo1FBUPSrEWS5epmFKOSqNCkJArMdVR0Aks+EYkcZFIoulLvHCGqMoIFvA7PadhNvYIrIBZsvxQMYzZ5qVRRhnbB7n/1sFi+WnyZ2MlvcyRVhBW03jAnM/UhKux9Hy56wCSe1CGP51kydATpu6L8YNNNCt5yEeufQWIFKUHwuX4t47A9YHJMwkoSdPeIDgEzrUSb9rgY9zx5hOfUyQj; 4:0W5pg+IKwtes18nfQjZQMcFN6YxmXyJkln3JzmIEqyodWevwXHMsC9ig0vJc/E9mxAd6Jkx1v2D/Vl03nKJ+e7JDSlVEkYyWWYtLSdQXb3mibV+n6T8Gd/qXNDaXmueh9ZSC5hoYsGtClp1I5m9JQOJgKu4gYWHppKCp9eNLE6TNfvH9YRytpvw01cCv+F9/ALKTmuJ5VA1FKmmQgJQBRUaeuxMEsEJFHUn3fZmdgT/SMgk/Ksxx1t/wz5MoJSrknoMmd4UNK7e81rl6IexMbTWFNg0Or5hiNlPeHDkQejUAIwxZ0wg7fqQ/D9ky+l3Z14o60BmChY0rFOqpxgVT719SzvCsgUGbel09HSt/iSy/p6S1tKVR038UDGzB7M9HEPsF1xhCFosC3kd+FDIyv1U7kBKiZ6oHkeNvU0X/+sD+ZZkMKuxTor997v/DeoDNhz2yCAxrEN5SgOac8I0YfedSlUX+097m2AahjvSp/4QoJ65EQyZpaAzKZpHzg4bAviL46mpTpLkBeDjhghFeIWSTom0/qAZj3HJF6cgtvcM= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(180628864354917); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(13023025)(13020025)(5005006)(8121501046)(13024025)(13013025)(10201501046)(3002001)(6055026); SRVR:DB6PR0802MB2568; BCL:0; PCL:0; RULEID:; SRVR:DB6PR0802MB2568; X-Forefront-PRVS: 011579F31F X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB6PR0802MB2568; 23:CnRxDGbL7fG8ApBLCDcBWjB6Em/T1J4ra5KZKFQ?= =?us-ascii?Q?Og7mTNotmd0TsILQInrpNzS8gxiR0h7YZp2j8fuEg0AezxwQkjOxPb4HUVMI?= =?us-ascii?Q?jxyMOBY6sd9gvboExlX3JhL9Zhnyse2tiCSz1cd6ulVFGPz1guGJeqRAqeAL?= =?us-ascii?Q?mk9GiXUVMkZ85BgsJTFwR+FG6RO+LaZCFKZrS7LJCvD+nyUDW6bW3QLgYDyI?= =?us-ascii?Q?k1CVTlZ2c5dh4zETmVeZ8851oa6GbeXfTzi8EiuiA1V3VTqtNQZd5MWdCyT7?= =?us-ascii?Q?DQnmSZFwYNH0jlycuRgQ+ESEEDKuMU9mzia4nTHro7pNdEBxzKCbOkcIMuN0?= =?us-ascii?Q?q+zpFypMOLj1vCVxEc6v97berAaQbbpexZD0pOL3vyZZD5AUOtNxM9KWv5yQ?= =?us-ascii?Q?F3rAdka5O26qM6gZrJGS2dRDTaClMAvLL0USSC2PCednwQVI/JcVpzUCQ3NM?= =?us-ascii?Q?FpGwIR+r7j59EZYQgD0c+QrWjpm8sVmoHe6uB46CM1FRfQ+NCz44dJE17Qfe?= =?us-ascii?Q?oA6KpM9vF+V9YUHEywvTaf1kQ9mlnjsawfcyIJWlfxMxHcyk+zKKQesInVVs?= =?us-ascii?Q?b+LtF1F+R7WiqJVx6BajVzGvY9oh69juRTWjRqRQT2SEgszsm5M36zwQdMoO?= =?us-ascii?Q?GZVzhFhHnWovM/BQYRXL8PROyDSggH2V7fvr4OBqIjxKcpJm/xY+pC3M94M7?= =?us-ascii?Q?nSLUZeMWIY9Z3exk0xEi2dG3YRz+FODDGBFdjnRdvvdfghPY5MSEoc8zKVVl?= =?us-ascii?Q?bcKfFugFdQwzEc/zhfRY71rSUaEz2xA9BXBUkYHhiRBqBcHer1Z2rIkorLw/?= =?us-ascii?Q?crbGxFynKIGZRpMMmqw5iqxSvHELzVtfBStN2sqdjjA0TGnlvYD3ZX1AvKH9?= =?us-ascii?Q?SRWxPdnQK1W1BXV3/QBB3JMckDm4/hkNnhsm8zSVEtIEuDg+mr2qVi++yhN3?= =?us-ascii?Q?90IsXhI1oLG7LekkxXCOf15CbM6E4SkYwmmw8t3Xapc5ZF2jfWjXssV87BiT?= =?us-ascii?Q?Ii7DPZJbEksfeDJGQ/RHNzCf7RZQElQBEj2Zy8++PaHS3zA=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; DB6PR0802MB2568; 6:5K68jL039qOSNaWaIIOLb+c4phVHPmOj6IqY+yVDfc2iFpgqSK7SiJeyWoxda52O/xYfcLSsffI0nbo90eLsPp/xERT8nwa84MCutlUbvmJJU3v7eGhYIRgk8IFR3OniFtY5Lk4SZqC3f115juqIsDccz6N+Rl9IL6eNZhawOIpCjIDKLCZOmmiiiSPBDavKHYnKYrxRdnwjCkEsn+AMnmcpZ4riKZZ/FPnxnbEV/bqIeJZQTaN2N9KtleTXLRhuqVeisXbJKJMzOdzKfS4YlA0iFPTbhtKTo3TRLFncnI++6VG8dgcYU9VfTS50HWW2dYlyHJ8H33cA0JnMAGArUA==; 5:39vagRpYA5OOAlOulFYBm7xqqZhb5KsyAbHl27CJWFSYJIsrdPncyAQ4FiB8iz8k/8hHZVDTUJDT3l4nZKdxBv0u60ZQ70+uQ+M8+QtSGeZnqlL9WpBlkC6K7VXk7X13WS32SU5FL5l5DI2xwQmVQg==; 24:HQHK+sWybOj69jmWYca1YY1iJE+AOlAdFYI9klQrSm2K0ZHdQG/LMVDYWoBNkr6lEAz9gbiRVmbvSPHcF/zJqdNggFvORzX9Y5lReJUuBjw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB6PR0802MB2568; 7:jIcGMYjEMG+ngGjDDyTEY1FHi/wLIgZUJA3OsLLMOe25jFf6KCtDVmSvGP52d9j+d5i0Seiu2emev74Qz6qsBHNMjdsL8vExljwAo9DduqC8u+tjGroPDh6Fh/DSN5NSlnBDiu1PwuWhpCH0mSdfKEXorW3CzgApbBUJ1egnIvqoa4ePToVhk/cP2GQVAwifJdQ6WFSCpmjG7hL5UwlXC0r+j6iVuMYi140L6dg2aciIGy+hwPhJ80wZJxn1/AxGFemT6+OL7hpzKACAlxKcCH64n7HBQw+zfgCVqYOE4XPbNmJVmm44AdWkfGhEBHfDbraqaNEvPzq2yxHSD2CZkzxhZD5SkC2/fVzcx5CJOOU= X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Nov 2016 02:52:17.3879 (UTC) X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[217.140.96.140]; Helo=[nebula.arm.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0802MB2568 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161102_195246_198042_D0A88100 X-CRM114-Status: GOOD ( 13.74 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, kaly.xin@arm.com, mhocko@suse.com, kirill.shutemov@linux.intel.com, steve.capper@arm.com, will.deacon@arm.com, linux-mm@kvack.org, aneesh.kumar@linux.vnet.ibm.com, Huang Shijie , n-horiguchi@ah.jp.nec.com, nd@arm.com, gerald.schaefer@de.ibm.com, mike.kravetz@oracle.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP After a future patch, the __alloc_buddy_huge_page() will not necessarily use the buddy allocator. So this patch removes the "buddy" from these functions: __alloc_buddy_huge_page -> __alloc_huge_page __alloc_buddy_huge_page_no_mpol -> __alloc_huge_page_no_mpol __alloc_buddy_huge_page_with_mpol -> __alloc_huge_page_with_mpol This patch makes preparation for the later patch. Acked-by: Steve Capper Signed-off-by: Huang Shijie --- mm/hugetlb.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 32594f1..0bf4444 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -1568,7 +1568,7 @@ static struct page *__hugetlb_alloc_buddy_huge_page(struct hstate *h, * For (2), we ignore 'vma' and 'addr' and use 'nid' exclusively. This * implies that memory policies will not be taken in to account. */ -static struct page *__alloc_buddy_huge_page(struct hstate *h, +static struct page *__alloc_huge_page(struct hstate *h, struct vm_area_struct *vma, unsigned long addr, int nid) { struct page *page; @@ -1649,21 +1649,21 @@ static struct page *__alloc_buddy_huge_page(struct hstate *h, * anywhere. */ static -struct page *__alloc_buddy_huge_page_no_mpol(struct hstate *h, int nid) +struct page *__alloc_huge_page_no_mpol(struct hstate *h, int nid) { unsigned long addr = -1; - return __alloc_buddy_huge_page(h, NULL, addr, nid); + return __alloc_huge_page(h, NULL, addr, nid); } /* * Use the VMA's mpolicy to allocate a huge page from the buddy. */ static -struct page *__alloc_buddy_huge_page_with_mpol(struct hstate *h, +struct page *__alloc_huge_page_with_mpol(struct hstate *h, struct vm_area_struct *vma, unsigned long addr) { - return __alloc_buddy_huge_page(h, vma, addr, NUMA_NO_NODE); + return __alloc_huge_page(h, vma, addr, NUMA_NO_NODE); } /* @@ -1681,7 +1681,7 @@ struct page *alloc_huge_page_node(struct hstate *h, int nid) spin_unlock(&hugetlb_lock); if (!page) - page = __alloc_buddy_huge_page_no_mpol(h, nid); + page = __alloc_huge_page_no_mpol(h, nid); return page; } @@ -1711,7 +1711,7 @@ static int gather_surplus_pages(struct hstate *h, int delta) retry: spin_unlock(&hugetlb_lock); for (i = 0; i < needed; i++) { - page = __alloc_buddy_huge_page_no_mpol(h, NUMA_NO_NODE); + page = __alloc_huge_page_no_mpol(h, NUMA_NO_NODE); if (!page) { alloc_ok = false; break; @@ -1963,7 +1963,7 @@ struct page *alloc_huge_page(struct vm_area_struct *vma, page = dequeue_huge_page_vma(h, vma, addr, avoid_reserve, gbl_chg); if (!page) { spin_unlock(&hugetlb_lock); - page = __alloc_buddy_huge_page_with_mpol(h, vma, addr); + page = __alloc_huge_page_with_mpol(h, vma, addr); if (!page) goto out_uncharge_cgroup; if (!avoid_reserve && vma_has_reserves(vma, gbl_chg)) { @@ -2221,7 +2221,7 @@ static unsigned long set_max_huge_pages(struct hstate *h, unsigned long count, * First take pages out of surplus state. Then make up the * remaining difference by allocating fresh huge pages. * - * We might race with __alloc_buddy_huge_page() here and be unable + * We might race with __alloc_huge_page() here and be unable * to convert a surplus huge page to a normal huge page. That is * not critical, though, it just means the overall size of the * pool might be one hugepage larger than it needs to be, but @@ -2267,7 +2267,7 @@ static unsigned long set_max_huge_pages(struct hstate *h, unsigned long count, * By placing pages into the surplus state independent of the * overcommit value, we are allowing the surplus pool size to * exceed overcommit. There are few sane options here. Since - * __alloc_buddy_huge_page() is checking the global counter, + * __alloc_huge_page() is checking the global counter, * though, we'll note that we're not allowed to exceed surplus * and won't grow the pool anywhere else. Not until one of the * sysctls are changed, or the surplus pages go out of use.