Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e30db3e6 authored by Vojtech Pavlik's avatar Vojtech Pavlik Committed by Linus Torvalds
Browse files

[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: default avatarVojtech Pavlik <vojtech@suse.cz>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 7b0e8501

arch/x86_64/kernel/time.c

+0 −14
Original line number Diff line number Diff line
@@ -56,8 +56,6 @@ DEFINE_SPINLOCK(i8253_lock); 
int nohpet __initdata = 0;

static int notsc __initdata = 0;



#undef HPET_HACK_ENABLE_DANGEROUS



unsigned int cpu_khz;					/* TSC clocks / usec, not used here */

static unsigned long hpet_period;			/* fsecs / HPET clock */

unsigned long hpet_tick;				/* HPET clocks / interrupt */
@@ -890,18 +888,6 @@ void __init time_init(void) 
	char *timename;

	char *gtod;



#ifdef HPET_HACK_ENABLE_DANGEROUS

        if (!vxtime.hpet_address) {

		printk(KERN_WARNING "time.c: WARNING: Enabling HPET base "

		       "manually!\n");

                outl(0x800038a0, 0xcf8);

                outl(0xff000001, 0xcfc);

                outl(0x800038a0, 0xcf8);

                vxtime.hpet_address = inl(0xcfc) & 0xfffffffe;

		printk(KERN_WARNING "time.c: WARNING: Enabled HPET "

		       "at %#lx.\n", vxtime.hpet_address);

        }

#endif

	if (nohpet)

		vxtime.hpet_address = 0;