From patchwork Wed Jun 1 18:04:58 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ralf Baechle X-Patchwork-Id: 841632 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p51Jlwv0028799 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 1 Jun 2011 19:48:20 GMT Received: from canuck.infradead.org ([134.117.69.58]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QRrOJ-0006Uv-FF; Wed, 01 Jun 2011 19:47:43 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QRrOJ-0001gS-7N; Wed, 01 Jun 2011 19:47:43 +0000 Received: from h5.dl5rb.org.uk ([81.2.74.5] helo=duck.linux-mips.net) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QRrOD-0001fP-UT for linux-arm-kernel@lists.infradead.org; Wed, 01 Jun 2011 19:47:40 +0000 Received: from duck.linux-mips.net (duck.linux-mips.net [127.0.0.1]) by duck.linux-mips.net (8.14.4/8.14.3) with ESMTP id p51JlVXp010116; Wed, 1 Jun 2011 20:47:31 +0100 Received: (from ralf@localhost) by duck.linux-mips.net (8.14.4/8.14.4/Submit) id p51JlUpY010114; Wed, 1 Jun 2011 20:47:30 +0100 Message-Id: <20110601180610.134151920@duck.linux-mips.net> User-Agent: quilt/0.48-1 Date: Wed, 01 Jun 2011 19:04:58 +0100 From: ralf@linux-mips.org To: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org Subject: [patch 02/14] i8253: Unify all kernel declarations of i8253_lock in . References: <20110601180456.801265664@duck.linux-mips.net> Content-Disposition: inline; filename=i8253-move-common-declarations-to-new-header.patch X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110601_154738_247806_B4107DA5 X-CRM114-Status: GOOD ( 12.68 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- Cc: linux-mips@linux-mips.org, Russell King , x86@kernel.org, Ingo Molnar , "H. Peter Anvin" , Thomas Gleixner , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Wed, 01 Jun 2011 19:48:20 +0000 (UTC) Signed-off-by: Ralf Baechle To: linux-kernel@vger.kernel.org Cc: Russell King Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: x86@kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-mips@linux-mips.org arch/arm/include/asm/i8253.h | 9 --------- arch/mips/include/asm/i8253.h | 12 ------------ arch/x86/include/asm/i8253.h | 10 ---------- include/linux/i8253.h | 14 ++++++++++++++ 4 files changed, 14 insertions(+), 31 deletions(-) Index: linux-mips/include/linux/i8253.h =================================================================== --- linux-mips.orig/include/linux/i8253.h +++ linux-mips/include/linux/i8253.h @@ -2,10 +2,24 @@ * This file is subject to the terms and conditions of the GNU General Public * License. See the file "COPYING" in the main directory of this archive * for more details. + * + * Machine specific IO port address definition for generic. + * Written by Osamu Tomita */ #ifndef __LINUX_I8253_H #define __LINUX_I8253_H +#include #include +/* i8253A PIT registers */ +#define PIT_MODE 0x43 +#define PIT_CH0 0x40 +#define PIT_CH2 0x42 + +#define inb_pit inb_p +#define outb_pit outb_p + +extern raw_spinlock_t i8253_lock; + #endif /* __LINUX_I8253_H */ Index: linux-mips/arch/arm/include/asm/i8253.h =================================================================== --- linux-mips.orig/arch/arm/include/asm/i8253.h +++ linux-mips/arch/arm/include/asm/i8253.h @@ -1,15 +1,6 @@ #ifndef __ASMARM_I8253_H #define __ASMARM_I8253_H -/* i8253A PIT registers */ -#define PIT_MODE 0x43 -#define PIT_CH0 0x40 - #define PIT_LATCH ((PIT_TICK_RATE + HZ / 2) / HZ) -extern raw_spinlock_t i8253_lock; - -#define outb_pit outb_p -#define inb_pit inb_p - #endif Index: linux-mips/arch/mips/include/asm/i8253.h =================================================================== --- linux-mips.orig/arch/mips/include/asm/i8253.h +++ linux-mips/arch/mips/include/asm/i8253.h @@ -5,20 +5,8 @@ #ifndef __ASM_I8253_H #define __ASM_I8253_H -#include - -/* i8253A PIT registers */ -#define PIT_MODE 0x43 -#define PIT_CH0 0x40 -#define PIT_CH2 0x42 - #define PIT_LATCH LATCH -extern raw_spinlock_t i8253_lock; - extern void setup_pit_timer(void); -#define inb_pit inb_p -#define outb_pit outb_p - #endif /* __ASM_I8253_H */ Index: linux-mips/arch/x86/include/asm/i8253.h =================================================================== --- linux-mips.orig/arch/x86/include/asm/i8253.h +++ linux-mips/arch/x86/include/asm/i8253.h @@ -1,20 +1,10 @@ #ifndef _ASM_X86_I8253_H #define _ASM_X86_I8253_H -/* i8253A PIT registers */ -#define PIT_MODE 0x43 -#define PIT_CH0 0x40 -#define PIT_CH2 0x42 - #define PIT_LATCH LATCH -extern raw_spinlock_t i8253_lock; - extern struct clock_event_device *global_clock_event; extern void setup_pit_timer(void); -#define inb_pit inb_p -#define outb_pit outb_p - #endif /* _ASM_X86_I8253_H */