diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2007-10-19 14:35:02 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2007-10-19 14:35:02 -0400 |
commit | b17530bda22e7ffbf08f7a8a50743256b1672f6a (patch) | |
tree | 061c081e68d8dc6f7326d45bca97997b337efe27 /arch | |
parent | 764922376ca39085e217656af6784a3377d98566 (diff) |
x86: add force_hpet boot option
add force_hpet boot option.
(this will be useful to make the forced-enable quirks depend on.)
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kernel/hpet.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c index f8367074da0d..22d8f00c80dc 100644 --- a/arch/x86/kernel/hpet.c +++ b/arch/x86/kernel/hpet.c | |||
@@ -69,12 +69,15 @@ static inline void hpet_clear_mapping(void) | |||
69 | * HPET command line enable / disable | 69 | * HPET command line enable / disable |
70 | */ | 70 | */ |
71 | static int boot_hpet_disable; | 71 | static int boot_hpet_disable; |
72 | int hpet_force_user; | ||
72 | 73 | ||
73 | static int __init hpet_setup(char* str) | 74 | static int __init hpet_setup(char* str) |
74 | { | 75 | { |
75 | if (str) { | 76 | if (str) { |
76 | if (!strncmp("disable", str, 7)) | 77 | if (!strncmp("disable", str, 7)) |
77 | boot_hpet_disable = 1; | 78 | boot_hpet_disable = 1; |
79 | if (!strncmp("force", str, 5)) | ||
80 | hpet_force_user = 1; | ||
78 | } | 81 | } |
79 | return 1; | 82 | return 1; |
80 | } | 83 | } |