From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751735AbeANOdA (ORCPT + 1 other); Sun, 14 Jan 2018 09:33:00 -0500 Received: from mga04.intel.com ([192.55.52.120]:49751 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751101AbeANOc6 (ORCPT ); Sun, 14 Jan 2018 09:32:58 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,359,1511856000"; d="scan'208";a="10420416" From: Andy Shevchenko To: "H. Peter Anvin" , Thomas Gleixner , Ingo Molnar , x86@kernel.org, linux-kernel@vger.kernel.org Cc: Andy Shevchenko Subject: [PATCH v1 1/6] x86/boot: Convert early_serial_base to unsigned long Date: Sun, 14 Jan 2018 16:32:49 +0200 Message-Id: <20180114143254.15429-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.15.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: As a preparatory of adding flexible serial I/O accessors, convert early_serial_base to unsigned long to cover all possible bus addresses on the system. No functional change intended. Signed-off-by: Andy Shevchenko --- arch/x86/boot/boot.h | 2 +- arch/x86/boot/compressed/early_serial_console.c | 2 +- arch/x86/boot/compressed/misc.h | 4 ++-- arch/x86/boot/early_serial_console.c | 6 +++--- arch/x86/boot/tty.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h index ef5a9cc66fb8..d9f8279774f6 100644 --- a/arch/x86/boot/boot.h +++ b/arch/x86/boot/boot.h @@ -299,7 +299,7 @@ int check_knl_erratum(void); int validate_cpu(void); /* early_serial_console.c */ -extern int early_serial_base; +extern unsigned long early_serial_base; void console_init(void); /* edd.c */ diff --git a/arch/x86/boot/compressed/early_serial_console.c b/arch/x86/boot/compressed/early_serial_console.c index 261e81fb9582..5e3a66478754 100644 --- a/arch/x86/boot/compressed/early_serial_console.c +++ b/arch/x86/boot/compressed/early_serial_console.c @@ -1,5 +1,5 @@ #include "misc.h" -int early_serial_base; +unsigned long early_serial_base; #include "../early_serial_console.c" diff --git a/arch/x86/boot/compressed/misc.h b/arch/x86/boot/compressed/misc.h index 9d323dc6b159..d36d4398a6b0 100644 --- a/arch/x86/boot/compressed/misc.h +++ b/arch/x86/boot/compressed/misc.h @@ -101,10 +101,10 @@ static inline void finalize_identity_maps(void) #ifdef CONFIG_EARLY_PRINTK /* early_serial_console.c */ -extern int early_serial_base; +extern unsigned long early_serial_base; void console_init(void); #else -static const int early_serial_base; +static const unsigned long early_serial_base; static inline void console_init(void) { } #endif diff --git a/arch/x86/boot/early_serial_console.c b/arch/x86/boot/early_serial_console.c index b25c53527a94..a5aec142c91a 100644 --- a/arch/x86/boot/early_serial_console.c +++ b/arch/x86/boot/early_serial_console.c @@ -23,7 +23,7 @@ #define DEFAULT_BAUD 9600 -static void early_serial_init(int port, int baud) +static void early_serial_init(unsigned long port, int baud) { unsigned char c; unsigned divisor; @@ -48,7 +48,7 @@ static void parse_earlyprintk(void) int baud = DEFAULT_BAUD; char arg[32]; int pos = 0; - int port = 0; + unsigned long port = 0; if (cmdline_find_option("earlyprintk", arg, sizeof arg) > 0) { char *e; @@ -118,7 +118,7 @@ static void parse_console_uart8250(void) { char optstr[64], *options; int baud = DEFAULT_BAUD; - int port = 0; + unsigned long port = 0; /* * console=uart8250,io,0x3f8,115200n8 diff --git a/arch/x86/boot/tty.c b/arch/x86/boot/tty.c index def2451f46ae..d1d34c6ca153 100644 --- a/arch/x86/boot/tty.c +++ b/arch/x86/boot/tty.c @@ -15,7 +15,7 @@ #include "boot.h" -int early_serial_base; +unsigned long early_serial_base; #define XMTRDY 0x20 -- 2.15.1