From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755056Ab2AaUQn (ORCPT ); Tue, 31 Jan 2012 15:16:43 -0500 Received: from terminus.zytor.com ([198.137.202.10]:57823 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752530Ab2AaUQl (ORCPT ); Tue, 31 Jan 2012 15:16:41 -0500 Date: Tue, 31 Jan 2012 12:16:22 -0800 From: tip-bot for He Chunhui Message-ID: Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com, tglx@linutronix.de, hpa@linux.intel.com, hchunhui@mail.ustc.edu.cn Reply-To: mingo@redhat.com, hpa@zytor.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, hpa@linux.intel.com, hchunhui@mail.ustc.edu.cn In-Reply-To: <32892299.2931391328028508117.JavaMail.coremail@mailweb> References: <32892299.2931391328028508117.JavaMail.coremail@mailweb> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/boot] x86, boot: Fix port argument to inl() function Git-Commit-ID: 35f1790e6c6a7e4cae57b616cf36444d27fa6b28 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.6 (terminus.zytor.com [127.0.0.1]); Tue, 31 Jan 2012 12:16:29 -0800 (PST) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 35f1790e6c6a7e4cae57b616cf36444d27fa6b28 Gitweb: http://git.kernel.org/tip/35f1790e6c6a7e4cae57b616cf36444d27fa6b28 Author: He Chunhui AuthorDate: Wed, 1 Feb 2012 00:48:28 +0800 Committer: H. Peter Anvin CommitDate: Tue, 31 Jan 2012 12:05:54 -0800 x86, boot: Fix port argument to inl() function "u32 port" in inl() should be "u16 port". [ hpa: it's a bug, but it doesn't produce incorrect code, so no need to put this into urgent or stable. ] Signed-off-by: He Chunhui Link: http://lkml.kernel.org/r/32892299.2931391328028508117.JavaMail.coremail@mailweb Signed-off-by: H. Peter Anvin --- arch/x86/boot/boot.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h index c7093bd..18997e5 100644 --- a/arch/x86/boot/boot.h +++ b/arch/x86/boot/boot.h @@ -67,7 +67,7 @@ static inline void outl(u32 v, u16 port) { asm volatile("outl %0,%1" : : "a" (v), "dN" (port)); } -static inline u32 inl(u32 port) +static inline u32 inl(u16 port) { u32 v; asm volatile("inl %1,%0" : "=a" (v) : "dN" (port));