aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorVojtech Pavlik <vojtech@suse.cz>2006-06-26 07:58:29 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-26 13:48:19 -0400
commite30db3e69948dafb616d121e52c8d62d38dab68c (patch)
tree14f03545e0796f7bbc5436f816ff044f76407bc0 /arch
parent7b0e85012581a9a8b12a8191d365716bf3ca3d3c (diff)
[PATCH] x86_64: Remove hack to manually enable HPET on AMD8111 southbridges
Remove #ifdefed code to manually enable HPET on AMD8111, where the BIOS doesn't have ACPI HPET tables and doesn't enable it for us. Signed-off-by: Vojtech Pavlik <vojtech@suse.cz> Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86_64/kernel/time.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/arch/x86_64/kernel/time.c b/arch/x86_64/kernel/time.c
index 54b14e3ef66f..ab9bea82945f 100644
--- a/arch/x86_64/kernel/time.c
+++ b/arch/x86_64/kernel/time.c
@@ -56,8 +56,6 @@ DEFINE_SPINLOCK(i8253_lock);
56int nohpet __initdata = 0; 56int nohpet __initdata = 0;
57static int notsc __initdata = 0; 57static int notsc __initdata = 0;
58 58
59#undef HPET_HACK_ENABLE_DANGEROUS
60
61unsigned int cpu_khz; /* TSC clocks / usec, not used here */ 59unsigned int cpu_khz; /* TSC clocks / usec, not used here */
62static unsigned long hpet_period; /* fsecs / HPET clock */ 60static unsigned long hpet_period; /* fsecs / HPET clock */
63unsigned long hpet_tick; /* HPET clocks / interrupt */ 61unsigned long hpet_tick; /* HPET clocks / interrupt */
@@ -890,18 +888,6 @@ void __init time_init(void)
890 char *timename; 888 char *timename;
891 char *gtod; 889 char *gtod;
892 890
893#ifdef HPET_HACK_ENABLE_DANGEROUS
894 if (!vxtime.hpet_address) {
895 printk(KERN_WARNING "time.c: WARNING: Enabling HPET base "
896 "manually!\n");
897 outl(0x800038a0, 0xcf8);
898 outl(0xff000001, 0xcfc);
899 outl(0x800038a0, 0xcf8);
900 vxtime.hpet_address = inl(0xcfc) & 0xfffffffe;
901 printk(KERN_WARNING "time.c: WARNING: Enabled HPET "
902 "at %#lx.\n", vxtime.hpet_address);
903 }
904#endif
905 if (nohpet) 891 if (nohpet)
906 vxtime.hpet_address = 0; 892 vxtime.hpet_address = 0;
907 893