Apply preempt_rt patch-4.9-rt1.patch.xz

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

diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
index a259e18d22d5b0e3293230e97979a5120d3265fa..8868045eabdeb522d66ce2ffbca8c05b2480df17 100644 (file)
--- a/drivers/hv/vmbus_drv.c
+++ b/drivers/hv/vmbus_drv.c
@@ -761,6 +761,8 @@ static void vmbus_isr(void)
        void *page_addr;
        struct hv_message *msg;
        union hv_synic_event_flags *event;
+       struct pt_regs *regs = get_irq_regs();
+       u64 ip = regs ? instruction_pointer(regs) : 0;
        bool handled = false;
 
        page_addr = hv_context.synic_event_page[cpu];
@@ -808,7 +810,7 @@ static void vmbus_isr(void)
                        tasklet_schedule(hv_context.msg_dpc[cpu]);
        }
 
-       add_interrupt_randomness(HYPERVISOR_CALLBACK_VECTOR, 0);
+       add_interrupt_randomness(HYPERVISOR_CALLBACK_VECTOR, 0, ip);
 }
 
 
@@ -961,7 +963,7 @@ int vmbus_device_register(struct hv_device *child_device_obj)
 {
        int ret = 0;
 
-       dev_set_name(&child_device_obj->device, "vmbus-%pUl",
+       dev_set_name(&child_device_obj->device, "%pUl",
                     child_device_obj->channel->offermsg.offer.if_instance.b);
 
        child_device_obj->device.bus = &hv_bus;