lkml.org 
[lkml]   [2007]   [Jun]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[patch-mm 15/23] x86_64: untangle asm/hpet.h from asm/timex.h
From:	Chris Wright <chrisw@sous-sol.org>

When making changes to x86_64 timers, I noticed that touching
hpet.h triggered an unreasonably large rebuild. Untangling
it from timex.h quiets the extra rebuild quite a bit.

Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: john stultz <johnstul@us.ibm.com>
Cc: Andi Kleen <ak@suse.de>

---
drivers/char/rtc.c | 2 +-
include/asm-x86_64/apic.h | 2 ++
include/asm-x86_64/hpet.h | 1 -
include/asm-x86_64/timex.h | 1 -
4 files changed, 3 insertions(+), 3 deletions(-)
Index: linux-2.6.22-rc4-mm/drivers/char/rtc.c
===================================================================
--- linux-2.6.22-rc4-mm.orig/drivers/char/rtc.c 2007-06-10 10:44:36.000000000 +0200
+++ linux-2.6.22-rc4-mm/drivers/char/rtc.c 2007-06-10 10:44:39.000000000 +0200
@@ -82,7 +82,7 @@
#include <asm/uaccess.h>
#include <asm/system.h>

-#if defined(__i386__)
+#if defined(__i386__) || defined(__x86_64__)
#include <asm/hpet.h>
#endif

Index: linux-2.6.22-rc4-mm/include/asm-x86_64/timex.h
===================================================================
--- linux-2.6.22-rc4-mm.orig/include/asm-x86_64/timex.h 2007-06-10 10:44:36.000000000 +0200
+++ linux-2.6.22-rc4-mm/include/asm-x86_64/timex.h 2007-06-10 10:44:39.000000000 +0200
@@ -9,7 +9,6 @@
#include <asm/8253pit.h>
#include <asm/msr.h>
#include <asm/vsyscall.h>
-#include <asm/hpet.h>
#include <asm/system.h>
#include <asm/processor.h>
#include <asm/tsc.h>
Index: linux-2.6.22-rc4-mm/include/asm-x86_64/apic.h
===================================================================
--- linux-2.6.22-rc4-mm.orig/include/asm-x86_64/apic.h 2007-06-10 10:44:36.000000000 +0200
+++ linux-2.6.22-rc4-mm/include/asm-x86_64/apic.h 2007-06-10 10:44:39.000000000 +0200
@@ -86,6 +86,8 @@ extern void setup_apic_routing(void);
extern void setup_APIC_extened_lvt(unsigned char lvt_off, unsigned char vector,
unsigned char msg_type, unsigned char mask);

+extern int apic_is_clustered_box(void);
+
#define K8_APIC_EXT_LVT_BASE 0x500
#define K8_APIC_EXT_INT_MSG_FIX 0x0
#define K8_APIC_EXT_INT_MSG_SMI 0x2
Index: linux-2.6.22-rc4-mm/include/asm-x86_64/hpet.h
===================================================================
--- linux-2.6.22-rc4-mm.orig/include/asm-x86_64/hpet.h 2007-06-10 10:44:36.000000000 +0200
+++ linux-2.6.22-rc4-mm/include/asm-x86_64/hpet.h 2007-06-10 10:44:39.000000000 +0200
@@ -55,7 +55,6 @@

extern int is_hpet_enabled(void);
extern int hpet_rtc_timer_init(void);
-extern int apic_is_clustered_box(void);
extern int hpet_arch_init(void);
extern int hpet_timer_stop_set_go(unsigned long tick);
extern int hpet_reenable(void);
--

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2007-06-10 11:39    [from the cache]
©2003-2011 Jasper Spaans