[RFC PATCH 1/5] x86_64: untangle asm/hpet.h from asm/timex.h

Chris Wright
2007-03-31T08:33:50Z

[-- Attachment #1: x86_64-remove-hpet-from-timex.patch --]
[-- Type: text/plain, Size: 1765 bytes --]

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>
Cc: Andi Kleen <ak@suse.de>
---
drivers/char/rtc.c | 2 +-
include/asm-x86_64/apic.h | 1 +
include/asm-x86_64/hpet.h | 1 -
include/asm-x86_64/timex.h | 1 -
4 files changed, 2 insertions(+), 3 deletions(-)

--- linus-2.6.orig/drivers/char/rtc.c
+++ linus-2.6/drivers/char/rtc.c
@@ -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

--- linus-2.6.orig/include/asm-x86_64/timex.h
+++ linus-2.6/include/asm-x86_64/timex.h
@@ -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>
--- linus-2.6.orig/include/asm-x86_64/apic.h
+++ linus-2.6/include/asm-x86_64/apic.h
@@ -84,6 +84,7 @@ extern int APIC_init_uniprocessor (void)
extern void disable_APIC_timer(void);
extern void enable_APIC_timer(void);
extern void clustered_apic_check(void);
+extern int apic_is_clustered_box(void);

extern void setup_APIC_extened_lvt(unsigned char lvt_off, unsigned char vector,
unsigned char msg_type, unsigned char mask);
--- linus-2.6.orig/include/asm-x86_64/hpet.h
+++ linus-2.6/include/asm-x86_64/hpet.h
@@ -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);

--