From patchwork Wed Nov 27 20:28:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 180329 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp6642185ilf; Wed, 27 Nov 2019 12:56:15 -0800 (PST) X-Google-Smtp-Source: APXvYqw0fVVLf3x5d31ZURJHuya2PLkUtbNh7MpqLRkuQ2ngI99Cj9mG83HFwkkcN8t179ZasqQb X-Received: by 2002:a50:f081:: with SMTP id v1mr34348255edl.131.1574888175495; Wed, 27 Nov 2019 12:56:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574888175; cv=none; d=google.com; s=arc-20160816; b=xA0hI5mmNIJ/ZkIVgwE3V+Vs2R4gY6N3Tjon9vkkE4hcjq0U1WqPq1gtGf0Dtp8HWk eFugavoONBNu0rCqWyIHNOKnhRJFhrphAL2UloapzjTHiZW6iw4y5VIg43pTqWZnKzIN tlT/UrjONtMmeV3OQg1XqHRmbVqnSp/ygygYQ7XbBieul99/mS1lXsIr4PV2OBeCU5FI 8Uyr2CFiC/5IEbAA2sGZd1pfsQV+BK7rws7tWS0/a5LCSl92P4GZnoPrNJtCwLqWlZRI 4+AaBPjU9+bZ0htmVl6OMUzJLtHdihXlnCcarad2fQGqkyjWQEulQmPAqEU6lligP3DJ VIxQ== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=1+S1qWJhzI32ZqWafA6IcLhUe8RREaZz4cwOj9x1YvA=; b=RYgCc3dsU/zWP8YuE0m0rh3yzTpw1/Cscf7O5o08imltSQGMmtaC9Acnz4ukcyxJal W5eC5qLurI8VBQ2ZIer4Dyf6ruwzLO6q5md1Nk7Rs3z9VCRYPt3L3zy3H6G0tMruyzV1 sl22FxYYSK7JaSryS913p2g+REwx6StNNmNMi6NhzBtGySt8I/jOiocQA2lzWhW8RGIi F/+0tGsZdcQqNgg4OeAQrb4vQyPW6qNtzAv1QIJ1AmagQPHwbwdY0N5KaBwfXLD8O/j6 ZbM/DROzCvXfFp4PEOSOK4EnntuBSqS96vvll0M3rE4N+lH9JtxHFHMP5KKEUrQ4bAsZ /QbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=T7EgxXbL; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h6si9963545ejt.227.2019.11.27.12.56.15; Wed, 27 Nov 2019 12:56:15 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=T7EgxXbL; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731037AbfK0U4N (ORCPT + 15 others); Wed, 27 Nov 2019 15:56:13 -0500 Received: from mail.kernel.org ([198.145.29.99]:47000 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730746AbfK0U4N (ORCPT ); Wed, 27 Nov 2019 15:56:13 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EB057215F1; Wed, 27 Nov 2019 20:56:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574888172; bh=4Bq9zUx7ceP48+ET5OQc8d7++KgI10SHReEseY/1MN0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T7EgxXbLx+BN8oZ4RBi7M08M4v5bVTFntMVsO5UxlxF6YW+IBvUFkGDdHE/zHVqsp fzM2tRET1FE4BbRr4c9S/B6gL5aRnyn4EoXMApyP9+zMtIKc+VG/Chze71uveAPfr1 bqIzkKT84ldLXefJeWQ7gn0duJDboci1Q5ufSEBg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Joel Stanley , Michael Ellerman , Sasha Levin Subject: [PATCH 4.19 032/306] powerpc/boot: Fix opal console in boot wrapper Date: Wed, 27 Nov 2019 21:28:02 +0100 Message-Id: <20191127203117.097130733@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191127203114.766709977@linuxfoundation.org> References: <20191127203114.766709977@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Joel Stanley [ Upstream commit 1a855eaccf353f7ed1d51a3d4b3af727ccbd81ca ] As of commit 10c77dba40ff ("powerpc/boot: Fix build failure in 32-bit boot wrapper") the opal code is hidden behind CONFIG_PPC64_BOOT_WRAPPER, but the boot wrapper avoids include/linux, so it does not get the normal Kconfig flags. We can drop the guard entirely as in commit f8e8e69cea49 ("powerpc/boot: Only build OPAL code when necessary") the makefile only includes opal.c in the build if CONFIG_PPC64_BOOT_WRAPPER is set. Fixes: 10c77dba40ff ("powerpc/boot: Fix build failure in 32-bit boot wrapper") Signed-off-by: Joel Stanley Signed-off-by: Michael Ellerman Signed-off-by: Sasha Levin --- arch/powerpc/boot/opal.c | 8 -------- 1 file changed, 8 deletions(-) -- 2.20.1 diff --git a/arch/powerpc/boot/opal.c b/arch/powerpc/boot/opal.c index 0272570d02de1..dfb199ef5b949 100644 --- a/arch/powerpc/boot/opal.c +++ b/arch/powerpc/boot/opal.c @@ -13,8 +13,6 @@ #include #include "../include/asm/opal-api.h" -#ifdef CONFIG_PPC64_BOOT_WRAPPER - /* Global OPAL struct used by opal-call.S */ struct opal { u64 base; @@ -101,9 +99,3 @@ int opal_console_init(void *devp, struct serial_console_data *scdp) return 0; } -#else -int opal_console_init(void *devp, struct serial_console_data *scdp) -{ - return -1; -} -#endif /* __powerpc64__ */