diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kernel/apic_64.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c index ce2f8015d5c..a73b443a123 100644 --- a/arch/x86/kernel/apic_64.c +++ b/arch/x86/kernel/apic_64.c | |||
@@ -790,24 +790,6 @@ static void setup_APIC_timer(unsigned int clocks) | |||
790 | 790 | ||
791 | local_irq_save(flags); | 791 | local_irq_save(flags); |
792 | 792 | ||
793 | /* wait for irq slice */ | ||
794 | if (hpet_address && hpet_use_timer) { | ||
795 | u32 trigger = hpet_readl(HPET_T0_CMP); | ||
796 | while (hpet_readl(HPET_T0_CMP) == trigger) | ||
797 | /* do nothing */ ; | ||
798 | } else { | ||
799 | int c1, c2; | ||
800 | outb_p(0x00, 0x43); | ||
801 | c2 = inb_p(0x40); | ||
802 | c2 |= inb_p(0x40) << 8; | ||
803 | do { | ||
804 | c1 = c2; | ||
805 | outb_p(0x00, 0x43); | ||
806 | c2 = inb_p(0x40); | ||
807 | c2 |= inb_p(0x40) << 8; | ||
808 | } while (c2 - c1 < 300); | ||
809 | } | ||
810 | |||
811 | irqen = ! cpu_isset(smp_processor_id(), | 793 | irqen = ! cpu_isset(smp_processor_id(), |
812 | timer_interrupt_broadcast_ipi_mask); | 794 | timer_interrupt_broadcast_ipi_mask); |
813 | __setup_APIC_LVTT(clocks, 0, irqen); | 795 | __setup_APIC_LVTT(clocks, 0, irqen); |