[patch-mm 05/33] x86_64: Untangle asm/hpet.h from asm/timex.h

[Thomas Gleixner <tglx@linutronix.de>]

[-- Attachment #1: x86_64-untangle-asm-hpeth-from-asm-timexh.patch --]
[-- Type: text/plain, Size: 2730 bytes --]

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>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Cc: john stultz <johnstul@us.ibm.com>

---

 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-rc6-mm/drivers/char/rtc.c
===================================================================
--- linux-2.6.22-rc6-mm.orig/drivers/char/rtc.c	2007-07-15 17:26:53.000000000 +0200
+++ linux-2.6.22-rc6-mm/drivers/char/rtc.c	2007-07-15 17:29:06.000000000 +0200
@@ -82,7 +82,7 @@
 #include <asm/uaccess.h>
 #include <asm/system.h>
 
-#if defined(__i386__)
+#ifdef CONFIG_X86
 #include <asm/hpet.h>
 #endif
 
Index: linux-2.6.22-rc6-mm/include/asm-x86_64/apic.h
===================================================================
--- linux-2.6.22-rc6-mm.orig/include/asm-x86_64/apic.h	2007-07-15 17:26:53.000000000 +0200
+++ linux-2.6.22-rc6-mm/include/asm-x86_64/apic.h	2007-07-15 17:49:06.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-rc6-mm/include/asm-x86_64/hpet.h
===================================================================
--- linux-2.6.22-rc6-mm.orig/include/asm-x86_64/hpet.h	2007-07-15 17:26:53.000000000 +0200
+++ linux-2.6.22-rc6-mm/include/asm-x86_64/hpet.h	2007-07-15 17:49:05.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);
Index: linux-2.6.22-rc6-mm/include/asm-x86_64/timex.h
===================================================================
--- linux-2.6.22-rc6-mm.orig/include/asm-x86_64/timex.h	2007-07-15 17:26:53.000000000 +0200
+++ linux-2.6.22-rc6-mm/include/asm-x86_64/timex.h	2007-07-15 17:29:06.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>

--