Merge branch 'x86-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / arch / x86 / kernel / hpet.c

diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index 437297a..88b4da3 100644 (file)
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -451,7 +451,7 @@ static struct irq_domain *hpet_domain;
 
 void hpet_msi_unmask(struct irq_data *data)
 {
-       struct hpet_dev *hdev = data->handler_data;
+       struct hpet_dev *hdev = irq_data_get_irq_handler_data(data);
        unsigned int cfg;
 
        /* unmask it */
@@ -462,7 +462,7 @@ void hpet_msi_unmask(struct irq_data *data)
 
 void hpet_msi_mask(struct irq_data *data)
 {
-       struct hpet_dev *hdev = data->handler_data;
+       struct hpet_dev *hdev = irq_data_get_irq_handler_data(data);
        unsigned int cfg;
 
        /* mask it */
@@ -785,7 +785,7 @@ static int hpet_clocksource_register(void)
 
        /* Verify whether hpet counter works */
        t1 = hpet_readl(HPET_COUNTER);
-       rdtscll(start);
+       start = rdtsc();
 
        /*
         * We don't know the TSC frequency yet, but waiting for
@@ -795,7 +795,7 @@ static int hpet_clocksource_register(void)
         */
        do {
                rep_nop();
-               rdtscll(now);
+               now = rdtsc();
        } while ((now - start) < 200000UL);
 
        if (t1 == hpet_readl(HPET_COUNTER)) {