From 55f93afd89fe6b9b9e12cfb2d3eb1a68e21f529e Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Sat, 21 Jul 2007 17:10:09 +0200 Subject: [PATCH] x86_64: Untangle asm/hpet.h from asm/timex.h 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. Cc: john stultz Signed-off-by: Chris Wright Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds --- 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(-) diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c index 30c3f54c76..ec6b65ec69 100644 --- a/drivers/char/rtc.c +++ b/drivers/char/rtc.c @@ -82,7 +82,7 @@ #include #include -#if defined(__i386__) +#ifdef CONFIG_X86 #include #endif diff --git a/include/asm-x86_64/apic.h b/include/asm-x86_64/apic.h index 45e9fca1fe..4c2d84dd4f 100644 --- a/include/asm-x86_64/apic.h +++ b/include/asm-x86_64/apic.h @@ -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 diff --git a/include/asm-x86_64/hpet.h b/include/asm-x86_64/hpet.h index 59a66f0846..71ccdd11d7 100644 --- a/include/asm-x86_64/hpet.h +++ b/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); diff --git a/include/asm-x86_64/timex.h b/include/asm-x86_64/timex.h index f6527e1b6c..6ed21f44d3 100644 --- a/include/asm-x86_64/timex.h +++ b/include/asm-x86_64/timex.h @@ -9,7 +9,6 @@ #include #include #include -#include #include #include #include -- 2.39.5