Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp2227660pxk; Mon, 14 Sep 2020 07:55:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzZAwudFi4fSkOZXNR7jKVGwe8kJWCNpBdWYvnCKPWn+DyMq8D0nP9zNFVTWul5HvhJqtnH X-Received: by 2002:aa7:de91:: with SMTP id j17mr17900153edv.85.1600095315471; Mon, 14 Sep 2020 07:55:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600095315; cv=none; d=google.com; s=arc-20160816; b=WJnh0oQ+wlWP7vmlKV40vPT5SFSCw1m4Pv48Fb5Zak6u3yQiYFK4kWlRb6CcKpr47q FZVayeQ+UAg+06KbZec2s6ilw5DHTc/f68isYnEop/3o+hjr341gJ6meOHsjGr2ZhqZs PbHhKiwFEs/A6TilXDXo+Z01H4hNMPrycRr/4kc1XEE7GxkIeOI7WsaRMClp7lG29xn9 wLgankvKyk7kSG94e5x17i+uGZr11XmjGJs3AUhyLagQa+r2jXXB17carmG/StZ6vpO9 1pIPFxa1haogg4FvpvKf03vkmriXc2JH+rkDXRkb+TXAIs0999Toy3FNFsXPJ57G/5vh O9VA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=yG7qWXKBUIxg7RQ3+cci8dpYxavPbFHR4ZLuySoica4=; b=bRyzbAA9VJUx4fRzKtfVDAvNAnEodEknLblfwAxHGC7UKm9o4opjkTJsoUynVI24kp 6BMkpKIr9hPmq5Xqf/Xm/xlojn5MGPqklWZ3QaBzX+dZ07d0e3QGGCO0ifOgWoF8pKQx 7BXJank/y5HdW3kywLMcrdnOv9Y8WWFcEdDctleIHoYdH4wKFi7LWh/o9II5g/ZlAYTG t98a4ERtwZqNJmpGBqeyTpqrHkUdx56J3RN7vVUTikqEx2Dkgb/WJVob0CwYONNlV+BX ehnF2wa2MHFlmj3qMi1tHIft4woMYZetfxDGm5obU9HfwawBgTckYlE3SqnZn60efd+y 5PKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=casper.20170209 header.b=IUgu2bMN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id gj23si7692790ejb.419.2020.09.14.07.54.52; Mon, 14 Sep 2020 07:55:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=fail header.i=@infradead.org header.s=casper.20170209 header.b=IUgu2bMN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726774AbgINOwV (ORCPT + 99 others); Mon, 14 Sep 2020 10:52:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41306 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726419AbgINOvj (ORCPT ); Mon, 14 Sep 2020 10:51:39 -0400 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2683AC061788; Mon, 14 Sep 2020 07:51:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=yG7qWXKBUIxg7RQ3+cci8dpYxavPbFHR4ZLuySoica4=; b=IUgu2bMNuG9D3yRoXTao7ZJ8F0 bi9cOkVyJbzYiWWHUCJVQtCjtfS1WOJDrcjH+8xfTxuF32oJH+t+iwKJxIfH9cQIx0ubhC0x6cBUH E7HyCBzJntz5qzVYF0OebK0LtgVouGMwPJoDrGil30HSYK3dlYRfK91E8XQSpnK7lIE1xiaTNBHi1 HtcwbVTlCRvy8GbmbHX7caUYl1HISztizQBCIDJTEas1Bg5MzPM/lh98U53IW6e9mpEmHWEg+HM3B 9zlDbT3UZzNeuyLd8r7YzrHdvg+/kFkPKOdOQ7URC8YirZWGUdedUJvmMj/yaNfps3p7zLv3CJ3EF 2aJ0nDkg==; Received: from 089144214092.atnat0023.highway.a1.net ([89.144.214.92] helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1kHpp0-0001ag-7f; Mon, 14 Sep 2020 14:51:10 +0000 From: Christoph Hellwig To: Mauro Carvalho Chehab , Thomas Bogendoerfer , "James E.J. Bottomley" , Joonyoung Shim , Seung-Woo Kim , Ben Skeggs , Marek Szyprowski , Tomasz Figa , Matt Porter , iommu@lists.linux-foundation.org Cc: Stefan Richter , linux1394-devel@lists.sourceforge.net, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org, linux-parisc@vger.kernel.org, linux-samsung-soc@vger.kernel.org, nouveau@lists.freedesktop.org, netdev@vger.kernel.org, linux-scsi@vger.kernel.org, linux-mm@kvack.org, alsa-devel@alsa-project.org Subject: [PATCH 02/17] mm: turn alloc_pages into an inline function Date: Mon, 14 Sep 2020 16:44:18 +0200 Message-Id: <20200914144433.1622958-3-hch@lst.de> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200914144433.1622958-1-hch@lst.de> References: <20200914144433.1622958-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org To prevent a compiler error when a method call alloc_pages is added (which I plan to for the dma_map_ops). Signed-off-by: Christoph Hellwig --- include/linux/gfp.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/linux/gfp.h b/include/linux/gfp.h index 67a0774e080b98..dd2577c5407112 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h @@ -550,8 +550,10 @@ extern struct page *alloc_pages_vma(gfp_t gfp_mask, int order, #define alloc_hugepage_vma(gfp_mask, vma, addr, order) \ alloc_pages_vma(gfp_mask, order, vma, addr, numa_node_id(), true) #else -#define alloc_pages(gfp_mask, order) \ - alloc_pages_node(numa_node_id(), gfp_mask, order) +static inline struct page *alloc_pages(gfp_t gfp_mask, unsigned int order) +{ + return alloc_pages_node(numa_node_id(), gfp_mask, order); +} #define alloc_pages_vma(gfp_mask, order, vma, addr, node, false)\ alloc_pages(gfp_mask, order) #define alloc_hugepage_vma(gfp_mask, vma, addr, order) \ -- 2.28.0