From patchwork Fri Nov 4 03:11:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Huang Shijie X-Patchwork-Id: 9411779 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 0C43660234 for ; Fri, 4 Nov 2016 03:14:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 00EF42ADDD for ; Fri, 4 Nov 2016 03:14:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E6C912AE20; Fri, 4 Nov 2016 03:14:09 +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 2D5702ADDD for ; Fri, 4 Nov 2016 03:14:08 +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 1c2UvF-0002Sc-Ke; Fri, 04 Nov 2016 03:12:05 +0000 Received: from mail-eopbgr10059.outbound.protection.outlook.com ([40.107.1.59] helo=EUR02-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1c2Uv8-0002D1-Hd for linux-arm-kernel@lists.infradead.org; Fri, 04 Nov 2016 03:12:01 +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=oI9sQjfJcQ5BzJD3AcTo8OKbezPFpZXsBNOQ0WkERbM=; b=fyZOQKklw+ft9uEa6TgURNHflvIWTUpajzx5uNn/DVF2ASfQeo57MliVpdHOBML4NNgb8PmRR5gaR+LaakCwdrZhNr6yl6HY/Qbg4KvkBDrF7Y2deplrkYH6t9m4ZLKuf2Nj8CedlfkrF9//OAWf7A0sHyGJY+vK/v1NxMJxkdo= Received: from AM3PR08CA0075.eurprd08.prod.outlook.com (10.163.23.171) by HE1PR08MB1017.eurprd08.prod.outlook.com (10.166.125.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.693.12; Fri, 4 Nov 2016 03:11:32 +0000 Received: from DB3FFO11FD019.protection.gbl (2a01:111:f400:7e04::142) by AM3PR08CA0075.outlook.office365.com (2a01:111:e400:8854::43) 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; Fri, 4 Nov 2016 03:11:33 +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 DB3FFO11FD019.mail.protection.outlook.com (10.47.217.50) 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; Fri, 4 Nov 2016 03:11:32 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:; UpperCasedChecksum:; SizeAsReceived:1063; Count:13 Received: from sha-win-210.shanghai.arm.com (10.1.2.79) by mail.arm.com (10.1.105.66) with Microsoft SMTP Server id 14.3.294.0; Fri, 4 Nov 2016 03:11:29 +0000 From: Huang Shijie To: , Subject: [PATCH] mm: hugetlb: rename some allocation functions Date: Fri, 4 Nov 2016 11:11:15 +0800 Message-ID: <1478229075-20262-1-git-send-email-shijie.huang@arm.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1478141499-13825-2-git-send-email-shijie.huang@arm.com> References: <1478141499-13825-2-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)(199003)(189002)(189998001)(2950100002)(246002)(87936001)(47776003)(5003940100001)(36756003)(106466001)(356003)(50226002)(7846002)(5660300001)(626004)(229853001)(86362001)(2906002)(8676002)(305945005)(104016004)(92566002)(77096005)(50466002)(48376002)(26826002)(4326007)(33646002)(76176999)(586003)(5001770100001)(6636002)(6666003)(19580405001)(19580395003)(8936002)(50986999); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR08MB1017; H:nebula.arm.com; FPR:; SPF:Pass; PTR:fw-tnat.cambridge.arm.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; DB3FFO11FD019; 1:N5aws+J9Qvf8T1xdA3ynNu2Pep7yiJmJ4iVr0gibLRutHVRMqUluzIJfE/gj+Z+lrKIuLXd5961aY+wueB7wCjlrDh16aj6qhIzEcwy1gBur5HjQ3toYGLqw+TDTeKrwwhNMuNmXPtcVV2VGvSCvgl2Bc489W/FT2L+B5DaSqkHy2cCPB8SJpmL47aRET1RidNWIB9fHYCS948RcfqGMbHyBT8nIqq76hZIeX08M9YbilZosXNqzPO6G3kZVXPvwLiN73/h0qOiy3nB19YBEA7QprO+brM0SjMLg/rDD9cxsCORG81lWRRZVJiePf8u1xxMxO8SLc9lFcbSszlTsgVC/j63mK8ofSV9qQB2fgHi9ynd2EfKiKe8f/5EkYwhbSz52dLPo/DiLoolreyEBcA6rJXGB4cn6GmuUR+Ld89MeJjIrxMAG+IfB/8DdopEjVcgvL7AoSNIu6aa5klUSjofRsL+ykf7qF3i1ieTgX8ER5JSS/AE6QKtF/FYwN91Pe4nsT4wu4UnieJvMJqEwXxDP/U+s3zqAMfwbjvAI7ikOLsx8v8OeRZOxg+yVp+Bb4QQqKqKf+jOn7N6DOh9tJwz5b6w3qUOr2ARSVSw9f1nc6qyV+zDSeql5oaUb9EkgQKr1q/O7wsA+3RzuiE98bxvszxOyEEun+ye6eBcukZQ= X-MS-Office365-Filtering-Correlation-Id: 4ba3e7ae-6380-4d14-820b-08d404604746 X-Microsoft-Exchange-Diagnostics: 1; HE1PR08MB1017; 2:vo75FSwd3U6aO79en0LwkVlqW2mF2P8sKiciw0X1uuC/Wv+c2yf3mrP3D27X2EozjcEOBzPRT/Lr+jEpEXQ9i1S5z5k/u15tfmLAAQdPAE4zeUfrDl3ReXihST5dSy4CxqagNbdYcP4XeJib8c3Xp4NJXbG6SVR1PIJ3ty1zlu3zXFiwQQQfs1FxyDVDqlKmsvP7ph+mpOZfvd/hO9bhbw==; 3:1wJMtHu5U56h1unuEONks1HzC32YzIhwPOPelqvnjCwT5F0tiNzdE0FWAyUU/vO/E2siRa8yMP6V6kXRTdYxD0bPeL4wF06guNbbipDGbzeiOsw6u89I8EuAKSaO1NyZaxacRu0ubhD+GUHGjidVuWPvR5FOIfCT5534gKhDo2l0K2hWfkevQoPJqOnzZ4CTi/91naGanM2RCCc7ZGepGIMbX/IDD99nWcav4CvJ6k/NmYHz1PLEXFabCMjRF2viEF+6TOo0QhmImJj1tdqwwUO+Ll93YRl6/fjyjMOUMuA= X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(8251501002); SRVR:HE1PR08MB1017; X-Microsoft-Exchange-Diagnostics: 1; HE1PR08MB1017; 25:s89v1aNTSs7HUZOidEN1NdMldu70gWZ6p2P6vR3cQuK3iDMyZKOxirsSjBmX/dNG6Y6f5wezpZ0CaRQGw7b/jW/EqZjMeJrVy/UwQkYMcHNID9Ck5OrVya/H5uv5dU920UH+TWgTYNHPZIt/CG0lj2UZyngtBYEbMv6bpkS84g8D5FL9R/7M+9BvMrm/jMhCe6ZH+YVCPy0PZudnmQsU5+w8IGykhgpi+ECSNSNyRQb+yvBNkR12W4RySmwhJeisRMOfBm8SeeMrWNmF5B4WBSCAgvwAuEWwk1w2I7tpzba24z9aM0uUCRmKuKeqMCMu9X1wVKaO6fX3kfh5tYLAeSmiALeLd3JfhZLriImFIsJjXcRnmzavhZHZyGthw7SwSgioeLcQ6xD8O4QMuyvjinGYr6LShZ85HuIk7Ax6DHM=; 31:wT8wQF1dEZ6J50bWoiMSMgi+LCKf6vKdAsAimopDLKX8Be9VeIFG4Plc2DqAP8me/+OI6xp1jiDWb97Kl0XXufixck3p/Qmmu7mUNQHGSJQjrePH9QC/ZSGbq79I4nzQaoHx9WizvGWMmaVXpvCthCEueWjWs2Qz2FxpC30tlSwbJGKyU0UcBao1eDtkp3RIK90lVaNObQ2k65CXI6Ss9Kui7JYlmbrzcuxlciS0IXDWvrt7Cdd80938nufQotpU; 20:cljdtjVxFYNs5jc3285IXHTE7+gfZekJmVsG7lgSvKVAX5GPT2+KF/qVxI+EHoYJvp2lJVge03ErFqYA5ytr1hQSTuiXabl4wuNGtPoj9YuThbRvMZ6+ej4FNGKBrS+Z9AV8zcK8uugpA6YT/G4U40gWQlXyOTDtWfcCmStxNKYMcXIsViYC7kf7nSQI2uKHd/YY4E/EtqZahHzMc4uzonhUSelGiBYvi1rk+H9E/PSmrEsOXbDp8XxgT3cAYJzS NoDisclaimer: True 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)(13024025)(13013025)(13023025)(8121501046)(13020025)(5005006)(10201501046)(3002001)(6055026); SRVR:HE1PR08MB1017; BCL:0; PCL:0; RULEID:; SRVR:HE1PR08MB1017; X-Microsoft-Exchange-Diagnostics: 1; HE1PR08MB1017; 4:7IA6zKBIdYZVARFifGizrwZb/tPyDc6XTs/aRXpyrhrZnypMHXxKBVdjNHudwkEE8Vg1XzPKLoaGK7sSLZ7UuhEh5CutEKNx0y8aq7IROHAfrcsgohcTD5vPrhsLBXSXgXQdeHPzFivchG/n2v4saGuOtsrHsts1E4C90WMIEazIRJn52XfYUCGJjwQtn5fMQD7ZTE8Xl6tyNK4iyEtfkKHJdIYmeLVZIqtLqKr6RrOQxYkGr4ftXFpaUm7hhnsDrmW8WHoyHD2J0ZBTIjzbMCuhM/ppLBrmqd7Y+NzAFIaZZsKXewua0+spee1e7p3e9EP+lC8BkRPEP3OtcXcIkkEMnnVbtEaMACMUh49lZOZw8OhX0RZV/yflO0ymvj/wxwj6Giov+EzhqQs3WNIYvs0Si3RYuoUmYOEQJX/gLwZKHCUoPm6KOJ77qpNfEpjC09Ya2d7XKmVinhbxeHHEm34P7O7onsDiv2WQ1XT4AK0piGY1Z1h7qTYlTBjCRkBF/gdPHVK7lSiSyGqVIKiKRDh2PlvUOo39eZzfmxl//PY= X-Forefront-PRVS: 01165471DB X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HE1PR08MB1017; 23:CND3qzghP3ADuO0shDhEV5XQ2yLD0XZ46xtDn6uRN?= =?us-ascii?Q?eg2EWkAMUre8TKob/6cg8fy6YsDPshLYu3Y9OB1+5Go392EZ7lob+s7HJEnN?= =?us-ascii?Q?e2aLTtTU4eh3LY5ZBa4NQsXeCYl7/tWMoDfRLFfSLTmi+ymFqmgWZMi1WZOM?= =?us-ascii?Q?95cwES9l4YlPPkbzp1c+91dVk0zW9rwvNfqnv7maSZdLN6BZo9HLfySQzsCJ?= =?us-ascii?Q?1ByZx/A5okgztELcysVeNg/X1XMoklug1AZ1h5nLh5kGzNaq5sd1dpuILs8N?= =?us-ascii?Q?W24w1Qf/0lVWKc6SZQdfhYfZZPOtP6QDN+Yy0aBGiCrzjTkf8g8/3n0cHKlP?= =?us-ascii?Q?nm4dts9T/ABXN8lpzc2uOwY/SfGrdZ9gCCdIYYIyNUvGkKy2QfsPf91HKRh9?= =?us-ascii?Q?cMYnabrxavxw1nPzvaiGBvPnKxsoa4WxTZTIGYK/auxvbivJZ6bDcs6RnuUQ?= =?us-ascii?Q?T9b2mLNhdOCr/hV1AeZGqb7gSl4vs1KJqL8IlFmbeyaZ6egUviYsi35Xk86Q?= =?us-ascii?Q?DFu4TKkWOt7QSI82dsbPuz25Y+20znd9vN1YqbkNxXfXdePEVVkyQiTjy1Th?= =?us-ascii?Q?dhjkLZT/gSxsGKehC+k5VVpH/kpLTS71/HxjC2pnYmMCo4xc78d73oNpWlVb?= =?us-ascii?Q?ZIvzitUsp2Nj02OChmsc6jjn2lwwLsd0i4cVAGhTXSXYgjUf4KL4WeBW1gNt?= =?us-ascii?Q?yRaAfB4kCnUGbkBFNSu+fxUjnmDCU6gGUwzu0ivX5N+JHOIbpseTfCjyqRS/?= =?us-ascii?Q?mdIkAKd9cC6y5lMo6XT63DBTnD3n68/YbMypME8WVm+xt//tYbKk+L9NtinL?= =?us-ascii?Q?+gVmmgCnT5fQC1WvnYd99BDG5ITxNt4ZqlZX10gvotlh/qMb9rnfbxCjlsRV?= =?us-ascii?Q?Ln8AjI0R1J/N8FGSSCLpSP1ou20dxFhwJtFFUB42n3MVNL6ueicSulfCs1fA?= =?us-ascii?Q?j8GEIk/xNYYu1SOhSczM4ZjB8rkN21D/SUxP11qgrAxUMIGw8wezm2KlA7Cm?= =?us-ascii?Q?ZuCHnJOaD5gleCRLbhSW5WGNmRRak6QPuiKhaGKuoM0hg=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; HE1PR08MB1017; 6:0x+DEAHHVDOFpaH91aN/9BkNQbHBMqkgBljqJ2hPbdBqyz0GYkyzTy0siUcELV2g2+PL0DDIDpzKS6qKegNt3+f8FvN/KgPUKv/HE7IlZW9YeT1BPsJws5U5F6sjbQLvCqp4EWwDx13RuUe4L/9hBlKglktuq7nyhyng68uP08Vo/6v91fnElpYzOTiqbImTHa7D3B6aQMv1oazwCs+4eOPi0Xhzw3/H2918GFFoZPgVaJnq/SuJtx9kTWXI9CpbQQKn1bQREuGMKHMYznuBwknMkqh7LpMt6tWrKZdNSVDgPVq4xCQ6K0JCXy/pVoQ4jtU/L5CWEi2ZTY0mivw3Nw==; 5:/VQaQcX7iUL9F5QM0QNDqD2HsCEpuThI3N+RDGeEKrt1f1blK+dEhVEcvG/jFJ85kEa4d7GV3QmjOyaZQ1a4y0fcKeKL8lUpz7V6+FT1uqbB9hryvnW6+NzG9VSqnpJ3ogOxJjZNIZcCdAq4lqEfq4PY4gT8bamNFLXgqjHayRM=; 24:q+MAN8QgCv53HU5qt/q2oslWj7Ff+tkdRArCmglJglBaYqAZhrELHdycONfmWhU/kk8RMJ+r7KuT2oH0zZrMFgvZ1BrmYdNbOyUQImOD8Pk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR08MB1017; 7:BGuY6S4pzbzF+9kbxOIw7LJGLCF7vT5TJX8UikUvXINMKDEKQxFOCKS+E3aP87C1Qiy/y8we+5mUYncpUL3gAf3Xk5wbyftcJrrhGPI0I1Zu8jGXmLCU/2eJwvjt/xBDYv4LeeL62pDGXg0pzbsw34AwaWLAQj3x2meDHIuBiAmKVFTqDWivA1f3lOD0Kh25oTV2kb06IuX06kngkrYazQSnEMcFBt4+kP7S3tHH+GKTGm0yGmtSs8L5NxTtMQEGMxwcP/VgtJ2wCiho2ENGFMe398IutcAIVbyFC76/EczgNn0mlge6OwMag2aub/DGo6jk9+DUGT/oVo+H58+hrLruWTM38SXWGdOk3hVNY3s= X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Nov 2016 03:11:32.2917 (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: HE1PR08MB1017 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161103_201159_097614_9AB8A075 X-CRM114-Status: GOOD ( 12.89 ) 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 --- Fix the build error in the x86 platform. --- mm/hugetlb.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 32594f1..9fdfc24 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -1163,6 +1163,10 @@ static inline void destroy_compound_gigantic_page(struct page *page, unsigned int order) { } static inline int alloc_fresh_gigantic_page(struct hstate *h, nodemask_t *nodes_allowed) { return 0; } +static struct page *alloc_gigantic_page(int nid, unsigned int order) +{ + return NULL; +} #endif static void update_and_free_page(struct hstate *h, struct page *page) @@ -1568,7 +1572,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 +1653,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 +1685,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 +1715,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 +1967,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 +2225,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 +2271,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.