Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux.git] / drivers / hv / hv.c

diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
index fcc52797c16935ea47cee18af55ae61de75681d4..6098e0cbdb4b0ad36f22fd214d2f0f59d08fec31 100644 (file)
--- a/drivers/hv/hv.c
+++ b/drivers/hv/hv.c
@@ -202,7 +202,7 @@ int hv_synic_init(unsigned int cpu)
 {
        hv_synic_enable_regs(cpu);
 
-       hv_stimer_init(cpu);
+       hv_stimer_legacy_init(cpu, VMBUS_MESSAGE_SINT);
 
        return 0;
 }
@@ -277,7 +277,7 @@ int hv_synic_cleanup(unsigned int cpu)
        if (channel_found && vmbus_connection.conn_state == CONNECTED)
                return -EBUSY;
 
-       hv_stimer_cleanup(cpu);
+       hv_stimer_legacy_cleanup(cpu);
 
        hv_synic_disable_regs(cpu);