From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 70D12C282CE for ; Wed, 24 Apr 2019 17:21:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3D0F920835 for ; Wed, 24 Apr 2019 17:21:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556126482; bh=1IbneeFxs0YGSLZoGnP9YUCxnrKT6HnZjpdkW+uChFg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=FtJEQDXe3BobjG8ZfzSE0uY/2p75M2oQvcQiPbk2maVjSRyBEODTMzcLwuVvQn+Ht KES9USu6rq4RCKAEXyRFzouSgiCk98jPor1Em8nqr8V1UfPGDKUiUKtlIJovGvFad+ cXRHKbdpJ7mGuaJaSEvMHntvLutEDcI1iMV452Kk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389320AbfDXRVV (ORCPT ); Wed, 24 Apr 2019 13:21:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:46788 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389283AbfDXRVS (ORCPT ); Wed, 24 Apr 2019 13:21:18 -0400 Received: from localhost (62-193-50-229.as16211.net [62.193.50.229]) (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 52C9B205ED; Wed, 24 Apr 2019 17:21:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556126477; bh=1IbneeFxs0YGSLZoGnP9YUCxnrKT6HnZjpdkW+uChFg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RchZNklWikEih03PeE3IAFr0YE7+3fTq18Mxx7Qclu8VJ0rik7TB2WlI/cUnZ3oTk nIyn4AlfFrXW1qlO8VhrO/5asIJa70oVL4FnZXY6QENimkHetFxthQnObjHIR0geDf nU4N01eJMZgQvZxN9GHW+qXQfwmfk4e1it3XMvJM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Michal Simek , Sasha Levin Subject: [PATCH 4.4 123/168] serial: uartps: console_setup() cant be placed to init section Date: Wed, 24 Apr 2019 19:09:27 +0200 Message-Id: <20190424170930.661710689@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190424170923.452349382@linuxfoundation.org> References: <20190424170923.452349382@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit 4bb1ce2350a598502b23088b169e16b43d4bc639 ] When console device is rebinded, console_setup() is called again. But marking it as __init means that function will be clear after boot is complete. If console device is binded again console_setup() is not found and error "Unable to handle kernel paging request at virtual address" is reported. Signed-off-by: Michal Simek Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/tty/serial/xilinx_uartps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c index 4f2f4aca8d2e..06efcef1b495 100644 --- a/drivers/tty/serial/xilinx_uartps.c +++ b/drivers/tty/serial/xilinx_uartps.c @@ -1145,7 +1145,7 @@ static void cdns_uart_console_write(struct console *co, const char *s, * * Return: 0 on success, negative errno otherwise. */ -static int __init cdns_uart_console_setup(struct console *co, char *options) +static int cdns_uart_console_setup(struct console *co, char *options) { struct uart_port *port = &cdns_uart_port[co->index]; int baud = 9600; -- 2.19.1