From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761077AbXGOQMr (ORCPT ); Sun, 15 Jul 2007 12:12:47 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1761777AbXGOQFU (ORCPT ); Sun, 15 Jul 2007 12:05:20 -0400 Received: from www.osadl.org ([213.239.205.134]:42563 "EHLO mail.tglx.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1762100AbXGOQFH (ORCPT ); Sun, 15 Jul 2007 12:05:07 -0400 Message-Id: <20070715155541.471134193@inhelltoy.tec.linutronix.de> References: <20070715155510.341941668@inhelltoy.tec.linutronix.de> User-Agent: quilt/0.46-1 Date: Sun, 15 Jul 2007 16:10:59 -0000 From: Thomas Gleixner To: LKML Cc: Ingo Molnar , Andrew Morton , Andi Kleen , Chris Wright Subject: [patch-mm 18/33] x86_64: use shared i8253.h Content-Disposition: inline; filename=x86_64-use-i386-i8253-h.patch Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Use the i386 i8253.h include file for x86_64 as well to share the exports and the PIT constants. Signed-off-by: Thomas Gleixner Signed-off-by: Chris Wright Signed-off-by: Ingo Molnar --- arch/x86_64/kernel/time.c | 4 ---- include/asm-x86_64/i8253.h | 8 ++------ 2 files changed, 2 insertions(+), 10 deletions(-) Index: linux-2.6.22-rc6-mm/include/asm-x86_64/i8253.h =================================================================== --- linux-2.6.22-rc6-mm.orig/include/asm-x86_64/i8253.h 2007-07-15 17:26:45.000000000 +0200 +++ linux-2.6.22-rc6-mm/include/asm-x86_64/i8253.h 2007-07-15 17:39:28.000000000 +0200 @@ -1,6 +1,2 @@ -#ifndef __ASM_I8253_H__ -#define __ASM_I8253_H__ - -extern spinlock_t i8253_lock; - -#endif /* __ASM_I8253_H__ */ +#include +#include Index: linux-2.6.22-rc6-mm/arch/x86_64/kernel/time.c =================================================================== --- linux-2.6.22-rc6-mm.orig/arch/x86_64/kernel/time.c 2007-07-15 17:34:42.000000000 +0200 +++ linux-2.6.22-rc6-mm/arch/x86_64/kernel/time.c 2007-07-15 17:48:54.000000000 +0200 @@ -32,7 +32,6 @@ #include /* for PM timer frequency */ #include #endif -#include #include #include #include @@ -292,9 +291,6 @@ static unsigned int __init tsc_calibrate return pmc_now * tsc_khz / (tsc_now - tsc_start); } -#define PIT_MODE 0x43 -#define PIT_CH0 0x40 - static void __pit_init(int val, u8 mode) { unsigned long flags; --