From nobody Wed May 8 04:08:47 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=none dis=none) header.from=wdc.com ARC-Seal: i=1; a=rsa-sha256; t=1558477737; cv=none; d=zoho.com; s=zohoarc; b=n45HDs7rh/6G1QmPZCPzKiwaAU2wjx5ndUCT6WEqIpPUArsZBPn4swFzTj5zv0X+4fNQXIy9zyeGxb8DlX5JT0tcSB/1KQdw1iW/dRZQvtBY802KeUWXImDJbUbE3Fw9QAphF4NJqB6I3E7fqJnSJ3HhrtB3NlIOOj6Xbory5gk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558477737; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=8N5kFPWwX7ylpa0wLywhEN4ZjPXiB/ZvAXpp3feidyU=; b=TLSyuvixI45m8Pd17AtEIXOI6+8ZRSqFiKgof3Cm/kNiSz2ukFIu8j42Unntce5OM1AVDGK9j01fKG5A8slOuqykJwyjERTsIFwIfdsZQzKmbzhAkZxv4wlJ70j+3z4RaSHM7kpp5gSZs3+ju6OHWXuuve/f0fp0ATrTru/47sQ= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail header.i=@wdc.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1558477737101820.4895653042006; Tue, 21 May 2019 15:28:57 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hTDD7-0005Fv-EN; Tue, 21 May 2019 22:26:17 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hTDD5-0005Fp-MV for xen-devel@lists.xenproject.org; Tue, 21 May 2019 22:26:16 +0000 Received: from esa2.hgst.iphmx.com (unknown [68.232.143.124]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 7121dad2-7c17-11e9-b2a6-07c4c40b6a82; Tue, 21 May 2019 22:26:14 +0000 (UTC) Received: from h199-255-45-14.hgst.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 22 May 2019 06:26:32 +0800 Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep01.wdc.com with ESMTP; 21 May 2019 15:01:36 -0700 Received: from risc6-mainframe.sdcorp.global.sandisk.com (HELO risc6-mainframe.int.fusionio.com) ([10.196.157.140]) by uls-op-cesaip01.wdc.com with ESMTP; 21 May 2019 15:26:13 -0700 X-Inumbo-ID: 7121dad2-7c17-11e9-b2a6-07c4c40b6a82 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1558477594; x=1590013594; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=8Dj8lOWT/s8wxxQiC8btpXWZgOzbpBWJpx34D2NpPKA=; b=qb/y0wlMTZrhDroNlWLCQ2raDrcbAGnl1bypeXctseRQMw1UpzIdudI3 fn7Al8VKjVWGW1sBm8vO573rxTvCXa7Gsej1mcbDrdGa6OtWNT/qOoKBp OD0js6UfvopOfaAbAEFPbzkvgs74trUiNsUz2XXxGl96zFieTEKu/VUsQ wxTVwbkJ3A6on0s5690s9qreGNWAuJDo+ldntBP4i0uTNaBas3DQOWmqc Abn9jYcrRp7dhCnMDbm0p6vpoMOZ+2Tfu2or1gQIGMSQ5YqzRT/c/kBlR +d/bwks4MFjC80HkJETdD6lNoMLxobUaHqZuJpW9iL7KS3omn9iHDzO9p g==; X-IronPort-AV: E=Sophos;i="5.60,496,1549900800"; d="scan'208";a="208259356" IronPort-SDR: GnC31co28Gfe4AsqlfzWbC8wwZCMD9vA1Ol8Er2pKAj5YeVBk9Tq6RQXKRvQOGdGf9TjL2YkaG 7I7bEQKRBvienfF/DmGonZp71V6uyVv28OKO2+NBYlPWTz5jV4jRYXL2SeF//dhZf3OaGmSNBZ crcpITEKd7NLizkZZEXWWcyhRvqai2A/elK584pRMCnjBcTdsHa1uPE4wkf3CZeQe1FRO6CORX 3tDWGYpWMqGHKarctzR6IFBI6YO0X1tsemEeV22B+NjxwQ9FUVOrTMThTHkgVXGd6D+za7N0Mi Iriihs7Z/N20LDddy/QVxnS2 IronPort-SDR: JIdPz49vuLYUEFp82wQt9o1BLfhzbAJXAYrY+Yr201Yr0ITRkrmrex1Zt07z+gYkM7wT1MMAHl CueSJMj9F0n2W5HL5Z1Ye4QO/1TRzG8PCCLK4tnI890scxyDNUOzQIaNSABGpoe/O6YKWAQl8y w/jRnnXjRanBKh/so1I7hrxH1FfD6iKOb8d2yUY4cWDj1A36ddZKBM2p7ToKDsTWarEkbZVYGY LBTycFdMHHoU38j9uTH4ELdwLmVsx7WWCA6bZ15P2xk1LrBu4scBHS3Zo/QuW2US1fWArObbBj 5+k= From: Alistair Francis To: xen-devel@lists.xenproject.org Date: Tue, 21 May 2019 15:24:18 -0700 Message-Id: <20190521222418.27107-1-alistair.francis@wdc.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [Xen-devel] [PATCH v3] xen/drivers/char: Protect the asm/vpl011.h include X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: sstabellini@kernel.org, wei.liu2@citrix.com, konrad.wilk@oracle.com, George.Dunlap@eu.citrix.com, ian.jackson@eu.citrix.com, tim@xen.org, julien.grall@arm.com, Alistair Francis , jbeulich@suse.com, andrew.cooper3@citrix.com, alistair23@gmail.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The only use of asm/vpl011.h is protected by the CONFIG_SBSA_VUART_CONSOLE define so lets protect the include as well. Signed-off-by: Alistair Francis Acked-by: Jan Beulich Acked-by: Stefano Stabellini --- v3: - Rework commit title and message - Split it into a seperate ifdef xen/drivers/char/console.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 38ecd9c015..d728e737d1 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -36,7 +36,8 @@ #ifdef CONFIG_X86 #include #include -#else +#endif +#ifdef CONFIG_SBSA_VUART_CONSOLE #include #endif =20 --=20 2.21.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel