diff options
author | Tero Roponen <tero.roponen@gmail.com> | 2011-05-31 03:24:39 -0400 |
---|---|---|
committer | John Stultz <john.stultz@linaro.org> | 2011-06-01 02:19:51 -0400 |
commit | df049672dddde4a2fdacf63fb32eb80146e26841 (patch) | |
tree | 6157a4a2cb247df276e1632e1218f192a07b4c33 /arch/x86/kernel/tsc.c | |
parent | 643d2d7992f4ce4f983d455b579f77b1e9c0af0c (diff) |
x86: tsc: Remove unneeded DMI-based blacklisting
The blacklist was added in response to my bug report
(http://lkml.org/lkml/2006/1/19/362) and has never
contained more than the one entry describing my old
now dead ThinkPad 380XD laptop. As found out later
(http://lkml.org/lkml/2007/11/29/50), this special
treatment has been unnecessary for a long time, so
it can be removed.
Signed-off-by: Tero Roponen <tero.roponen@gmail.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'arch/x86/kernel/tsc.c')
-rw-r--r-- | arch/x86/kernel/tsc.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c index 6cc6922262af..5c45c62cce5d 100644 --- a/arch/x86/kernel/tsc.c +++ b/arch/x86/kernel/tsc.c | |||
@@ -5,7 +5,6 @@ | |||
5 | #include <linux/timer.h> | 5 | #include <linux/timer.h> |
6 | #include <linux/acpi_pmtmr.h> | 6 | #include <linux/acpi_pmtmr.h> |
7 | #include <linux/cpufreq.h> | 7 | #include <linux/cpufreq.h> |
8 | #include <linux/dmi.h> | ||
9 | #include <linux/delay.h> | 8 | #include <linux/delay.h> |
10 | #include <linux/clocksource.h> | 9 | #include <linux/clocksource.h> |
11 | #include <linux/percpu.h> | 10 | #include <linux/percpu.h> |
@@ -800,27 +799,6 @@ void mark_tsc_unstable(char *reason) | |||
800 | 799 | ||
801 | EXPORT_SYMBOL_GPL(mark_tsc_unstable); | 800 | EXPORT_SYMBOL_GPL(mark_tsc_unstable); |
802 | 801 | ||
803 | static int __init dmi_mark_tsc_unstable(const struct dmi_system_id *d) | ||
804 | { | ||
805 | printk(KERN_NOTICE "%s detected: marking TSC unstable.\n", | ||
806 | d->ident); | ||
807 | tsc_unstable = 1; | ||
808 | return 0; | ||
809 | } | ||
810 | |||
811 | /* List of systems that have known TSC problems */ | ||
812 | static struct dmi_system_id __initdata bad_tsc_dmi_table[] = { | ||
813 | { | ||
814 | .callback = dmi_mark_tsc_unstable, | ||
815 | .ident = "IBM Thinkpad 380XD", | ||
816 | .matches = { | ||
817 | DMI_MATCH(DMI_BOARD_VENDOR, "IBM"), | ||
818 | DMI_MATCH(DMI_BOARD_NAME, "2635FA0"), | ||
819 | }, | ||
820 | }, | ||
821 | {} | ||
822 | }; | ||
823 | |||
824 | static void __init check_system_tsc_reliable(void) | 802 | static void __init check_system_tsc_reliable(void) |
825 | { | 803 | { |
826 | #ifdef CONFIG_MGEODE_LX | 804 | #ifdef CONFIG_MGEODE_LX |
@@ -1010,8 +988,6 @@ void __init tsc_init(void) | |||
1010 | lpj_fine = lpj; | 988 | lpj_fine = lpj; |
1011 | 989 | ||
1012 | use_tsc_delay(); | 990 | use_tsc_delay(); |
1013 | /* Check and install the TSC clocksource */ | ||
1014 | dmi_check_system(bad_tsc_dmi_table); | ||
1015 | 991 | ||
1016 | if (unsynchronized_tsc()) | 992 | if (unsynchronized_tsc()) |
1017 | mark_tsc_unstable("TSCs unsynchronized"); | 993 | mark_tsc_unstable("TSCs unsynchronized"); |