The patch titled
x86_64: restore restore nohpet cmdline
has been added to the -mm tree. Its filename is
x86_64-restore-restore-nohpet-cmdline.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: restore restore nohpet cmdline
From: Chris Wright <chrisw@xxxxxxxxxxxx>
Lost when merged with i386. Happy to drop, but I suspect Andi would rather
not break existing users (I noticed because it was part of my testing). If
dropped, Documentation needs updating.
Signed-off-by: Chris Wright <chrisw@xxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: john stultz <johnstul@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/i386/kernel/hpet.c | 7 +++++++
1 files changed, 7 insertions(+)
diff -puN arch/i386/kernel/hpet.c~x86_64-restore-restore-nohpet-cmdline arch/i386/kernel/hpet.c
--- a/arch/i386/kernel/hpet.c~x86_64-restore-restore-nohpet-cmdline
+++ a/arch/i386/kernel/hpet.c
@@ -89,6 +89,13 @@ static int __init hpet_setup(char* str)
}
__setup("hpet=", hpet_setup);
+static int __init disable_hpet(char *str)
+{
+ boot_hpet_disable = 1;
+ return 1;
+}
+__setup("nohpet", disable_hpet);
+
static inline int is_hpet_capable(void)
{
return (!boot_hpet_disable && hpet_address);
_
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
