The patch titled
x86_64: untangle asm/hpet.h from asm/timex.h
has been added to the -mm tree. Its filename is
x86_64-untangle-asm-hpeth-from-asm-timexh.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: x86_64: untangle asm/hpet.h from asm/timex.h
From: Chris Wright <chrisw@xxxxxxxxxxxx>
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@xxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: john stultz <johnstul@xxxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
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 -puN drivers/char/rtc.c~x86_64-untangle-asm-hpeth-from-asm-timexh drivers/char/rtc.c
--- a/drivers/char/rtc.c~x86_64-untangle-asm-hpeth-from-asm-timexh
+++ a/drivers/char/rtc.c
@@ -82,7 +82,7 @@
#include <asm/uaccess.h>
#include <asm/system.h>
-#if defined(__i386__)
+#ifdef CONFIG_X86
#include <asm/hpet.h>
#endif
diff -puN include/asm-x86_64/apic.h~x86_64-untangle-asm-hpeth-from-asm-timexh include/asm-x86_64/apic.h
--- a/include/asm-x86_64/apic.h~x86_64-untangle-asm-hpeth-from-asm-timexh
+++ a/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 -puN include/asm-x86_64/hpet.h~x86_64-untangle-asm-hpeth-from-asm-timexh include/asm-x86_64/hpet.h
--- a/include/asm-x86_64/hpet.h~x86_64-untangle-asm-hpeth-from-asm-timexh
+++ a/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 -puN include/asm-x86_64/timex.h~x86_64-untangle-asm-hpeth-from-asm-timexh include/asm-x86_64/timex.h
--- a/include/asm-x86_64/timex.h~x86_64-untangle-asm-hpeth-from-asm-timexh
+++ a/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>
_
Patches currently in -mm which might be from chrisw@xxxxxxxxxxxx are
ntp-move-the-cmos-update-code-into-ntpc.patch
i386-hpet-assumes-boot-cpu-is-0.patch
x86_64-untangle-asm-hpeth-from-asm-timexh.patch
x86_64-use-generic-cmos-update.patch
x86_64-convert-to-cleckevents.patch
x86_64-restore-restore-nohpet-cmdline.patch
x86_64-prep-idle-loop-for-dynticks.patch
x86_64-enable-high-resolution-timers-and-dynticks.patch
implement-file-posix-capabilities.patch
implement-file-posix-capabilities-fix.patch
user-namespace-add-the-framework.patch
user-namespace-add-unshare.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
