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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 8C75CC43381 for ; Sat, 30 Mar 2019 01:34:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5039D2184C for ; Sat, 30 Mar 2019 01:34:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553909676; bh=X2TnbvXMEZR4JPGHMWi+uFdCWlarJ65/tyJFDAF8q84=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=KiGaqtG3UwJgFtCRQfjZ0y04OhWSoRZMM8/AHfZmcrOHN/4KMjYen6LSiCDtVEvrP I4fhj+1NkSlRhe/SfbrBSjx3XxdIVDEXy0/i6aJjvJusdQp6tkbWfCuV+haJ81AvJ8 nQg76kl//Y66YIIzEO9AiKAfFSsVySu9U1jRM8Ak= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732249AbfC3BcH (ORCPT ); Fri, 29 Mar 2019 21:32:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:40066 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732244AbfC3BcH (ORCPT ); Fri, 29 Mar 2019 21:32:07 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 77601218FC; Sat, 30 Mar 2019 01:32:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553909527; bh=X2TnbvXMEZR4JPGHMWi+uFdCWlarJ65/tyJFDAF8q84=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=t+PVeaJNojZVvzpibn4PSdyyRlZ8MKl5B7uJzZEghdcXYzCt3ADVzVe2jnmdI/PpQ i/Wkv7jxlXvokNNDBCYXgcm8tduzdov7szU/kg01rxbF2eZazJNXgbX9dH/wve3nVx 0q6dV/wMQga3z9YWumc/sizM5Cm78oO2SxcZLjGA= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Michal Simek , Greg Kroah-Hartman , Sasha Levin , linux-serial@vger.kernel.org Subject: [PATCH AUTOSEL 4.4 05/16] serial: uartps: console_setup() can't be placed to init section Date: Fri, 29 Mar 2019 21:31:49 -0400 Message-Id: <20190330013200.1130-5-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190330013200.1130-1-sashal@kernel.org> References: <20190330013200.1130-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Michal Simek [ 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