From patchwork Thu Sep 13 11:56:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Murray X-Patchwork-Id: 10599317 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id ED18F921 for ; Thu, 13 Sep 2018 11:57:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DB3C82A559 for ; Thu, 13 Sep 2018 11:57:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CF49A2A6EF; Thu, 13 Sep 2018 11:57:20 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 806A42A559 for ; Thu, 13 Sep 2018 11:57:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=47UtUwa/QlD0tLz9LvAPkCxOcyXI8wm23+Bg+Vzj92w=; b=fhv G0I95MhX2MnR2euz7DrSCugu3Y+xadCVsAb2h68G+bKcbiHK4iMra3iEhf/5tbbM6HDZrkoZOzMN1 jBchQIVriEmgrBP4lDwXzN763kiFXoFo1wcCRtr9c2WfMYjN1ovi6JM9cD1Jext3v5yhI7fGT717+ xkIBQiHuM2AySd7THCrUJkjDj4kiKG9sk0ke7w0LjzPPOiLew0J5Jz2zXKyGF43O/w1kXwt+Du1/z 5ykhSsvEW8+lAs4dzyLmDnqjwPYw+ta6OCD3pjuYr0uReQ1ES0WNJeYHBDm3tHtxgi6eU9+WtuFgZ u5zAW3b51STxqsmrygb8zEEtB5RfjKw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1g0QFE-0006h0-VG; Thu, 13 Sep 2018 11:57:12 +0000 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70] helo=foss.arm.com) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1g0QFB-0006g0-CE for linux-arm-kernel@lists.infradead.org; Thu, 13 Sep 2018 11:57:10 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 344667A9; Thu, 13 Sep 2018 04:56:55 -0700 (PDT) Received: from e119886-lin.cambridge.arm.com (unknown [10.37.6.15]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 4C0AE3F557; Thu, 13 Sep 2018 04:56:54 -0700 (PDT) From: Andrew Murray To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] arm64: Remove unused VGA console support Date: Thu, 13 Sep 2018 12:56:40 +0100 Message-Id: <1536839800-14918-1-git-send-email-andrew.murray@arm.com> X-Mailer: git-send-email 2.7.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180913_045709_423006_C2727B0D X-CRM114-Status: GOOD ( 10.58 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Catalin Marinas , Will Deacon MIME-Version: 1.0 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 Support for VGA_CONSOLE is not allowable due to commit ee23794b8668 ("video: vgacon: Don't build on arm64"), thus remove the associated unused code. Whilst PCI on arm64 would support VGA a valid screen_info structure is missing. Signed-off-by: Andrew Murray Acked-by: Will Deacon --- arch/arm64/kernel/setup.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 5b4fac4..95670a1 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -351,12 +351,8 @@ void __init setup_arch(char **cmdline_p) #endif #ifdef CONFIG_VT -#if defined(CONFIG_VGA_CONSOLE) - conswitchp = &vga_con; -#elif defined(CONFIG_DUMMY_CONSOLE) conswitchp = &dummy_con; #endif -#endif if (boot_args[1] || boot_args[2] || boot_args[3]) { pr_err("WARNING: x1-x3 nonzero in violation of boot protocol:\n" "\tx1: %016llx\n\tx2: %016llx\n\tx3: %016llx\n"