From patchwork Tue Aug 25 15:20:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Randy Dunlap X-Patchwork-Id: 11735909 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D4A6F739 for ; Tue, 25 Aug 2020 15:20:56 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 9B96C207D3 for ; Tue, 25 Aug 2020 15:20:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="fdQK1ZhN" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9B96C207D3 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id B1E40900004; Tue, 25 Aug 2020 11:20:55 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id ACBAE8D0001; Tue, 25 Aug 2020 11:20:55 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A0997900004; Tue, 25 Aug 2020 11:20:55 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0155.hostedemail.com [216.40.44.155]) by kanga.kvack.org (Postfix) with ESMTP id 864558D0001 for ; Tue, 25 Aug 2020 11:20:55 -0400 (EDT) Received: from smtpin25.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 132C01F08 for ; Tue, 25 Aug 2020 15:20:55 +0000 (UTC) X-FDA: 77189453670.25.star22_1b162d82705c Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin25.hostedemail.com (Postfix) with ESMTP id 8697E1804E52F for ; Tue, 25 Aug 2020 15:20:39 +0000 (UTC) X-Spam-Summary: 1,0,0,622952ab08650093,d41d8cd98f00b204,rdunlap@infradead.org,,RULES_HIT:41:152:355:379:800:854:960:973:988:989:1260:1277:1311:1313:1314:1345:1381:1431:1437:1515:1516:1518:1534:1541:1593:1594:1711:1714:1730:1747:1777:1792:2393:2559:2562:3138:3139:3140:3141:3142:3351:3865:3866:3870:3871:3873:4321:4559:5007:6119:6261:6653:7576:7875:7903:10004:10400:11026:11473:11658:11914:12043:12048:12296:12297:12438:12517:12519:12679:13069:13311:13357:13894:14181:14394:14721:21080:21451:21627:30054:30064,0,RBL:205.233.59.134:@infradead.org:.lbl8.mailshell.net-62.8.55.100 64.201.201.201;04y835aajnc1fspznheox8u7owyruypdf894y9zg86jqgi9194mhw6esjwqkx6r.f6rxqeeju9uqrwd7q58hbir1ttq5obg1o8sxr99idfhz3bq3uk439dghdnbcau9.a-lbl8.mailshell.net-223.238.255.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:24,LUA_SUMMARY:none X-HE-Tag: star22_1b162d82705c X-Filterd-Recvd-Size: 2823 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by imf35.hostedemail.com (Postfix) with ESMTP for ; Tue, 25 Aug 2020 15:20:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Content-Transfer-Encoding:Content-Type: MIME-Version:Date:Message-ID:Subject:From:To:Sender:Reply-To:Cc:Content-ID: Content-Description:In-Reply-To:References; bh=ENFgYq2det3TbaKrOxz6iT496d9fQlJUs9aH/gy1mek=; b=fdQK1ZhNC+bUU186LjBNw/dv/S 6tuWfa8JvNSy62lFo1WGM0FKljnJGeAka02oLi2Y9Db9NkDbWZC6FLFOYb8udjMYWhLw/8gihhDdb +ieOqpgxAsaLJEcWGLr1QzooQG38jz7fkeKAb0Ov+NSmBl0j6TpcvbQ332PriZ9eny3AmkLhi1rB5 QN8JT+ZpsJo0K4dfV09m1DVHYd4EOpJMNNx6OWPDWxmiojhjBBeoyF4yoTYBOBdGlNCyln20Sal0V LcjXU++nZNE6bd4OSXe3YDMz0/GYCq0XaUJUR8S1NrN3sYk9LABcXpb12ztwA+aWpx8p4YAFGD88Q r9QHSocA==; Received: from [2601:1c0:6280:3f0::19c2] by merlin.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1kAakR-0007Uv-Qu; Tue, 25 Aug 2020 15:20:32 +0000 To: Andrew Morton , LKML , Linux MM , Dan Williams From: Randy Dunlap Subject: [PATCH mmotm] x86/numa: fix build when CONFIG_ACPI is not set Message-ID: <70e5ee34-9809-a997-7b49-499e4be61307@infradead.org> Date: Tue, 25 Aug 2020 08:20:27 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.11.0 MIME-Version: 1.0 Content-Language: en-US X-Rspamd-Queue-Id: 8697E1804E52F X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam02 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: Randy Dunlap Fix build errors when CONFIG_ACPI is not set/enabled by adding in the #else (!CONFIG_ACPI) block. ../arch/x86/mm/numa.c: In function ‘numa_setup’: ../arch/x86/mm/numa.c:43:3: error: implicit declaration of function ‘disable_srat’; did you mean ‘disable_irq’? [-Werror=implicit-function-declaration] disable_srat(); ^~~~~~~~~~~~ ../arch/x86/mm/numa.c:45:3: error: implicit declaration of function ‘disable_hmat’; did you mean ‘disable_dma’? [-Werror=implicit-function-declaration] disable_hmat(); ^~~~~~~~~~~~ Signed-off-by: Randy Dunlap Cc: Dan Williams --- include/linux/acpi.h | 2 ++ 1 file changed, 2 insertions(+) --- mmotm-2020-0824-1606.orig/include/linux/acpi.h +++ mmotm-2020-0824-1606/include/linux/acpi.h @@ -709,6 +709,8 @@ static inline u64 acpi_arch_get_root_poi #define ACPI_HANDLE_FWNODE(fwnode) (NULL) #define ACPI_DEVICE_CLASS(_cls, _msk) .cls = (0), .cls_msk = (0), +#include + struct fwnode_handle; static inline bool acpi_dev_found(const char *hid)