[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-devel] [PATCH 07/31] Fix compile error. The bind_to_irq_handler has different arguments.



Also fix the function decleration for 'pcifront_handler_aer' as
irqhandler's decleration has changed.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
---
 drivers/xen/pcifront/pci_op.c   |    2 +-
 drivers/xen/pcifront/pcifront.h |    2 +-
 drivers/xen/pcifront/xenbus.c   |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/xen/pcifront/pci_op.c b/drivers/xen/pcifront/pci_op.c
index e807cd7..550d94d 100644
--- a/drivers/xen/pcifront/pci_op.c
+++ b/drivers/xen/pcifront/pci_op.c
@@ -667,7 +667,7 @@ void pcifront_do_aer(void *data)
 
 }
 
-irqreturn_t pcifront_handler_aer(int irq, void *dev, struct pt_regs *regs)
+irqreturn_t pcifront_handler_aer(int irq, void *dev)
 {
        struct pcifront_device *pdev = dev;
        schedule_pcifront_aer_op(pdev);
diff --git a/drivers/xen/pcifront/pcifront.h b/drivers/xen/pcifront/pcifront.h
index 06cb3e1..d67ae95 100644
--- a/drivers/xen/pcifront/pcifront.h
+++ b/drivers/xen/pcifront/pcifront.h
@@ -50,6 +50,6 @@ void pcifront_free_roots(struct pcifront_device *pdev);
 
 void pcifront_do_aer( void *data);
 
-irqreturn_t pcifront_handler_aer(int irq, void *dev, struct pt_regs *regs);
+irqreturn_t pcifront_handler_aer(int irq, void *dev);
 
 #endif /* __XEN_PCIFRONT_H__ */
diff --git a/drivers/xen/pcifront/xenbus.c b/drivers/xen/pcifront/xenbus.c
index d5b939c..3348cff 100644
--- a/drivers/xen/pcifront/xenbus.c
+++ b/drivers/xen/pcifront/xenbus.c
@@ -94,8 +94,8 @@ static int pcifront_publish_info(struct pcifront_device *pdev)
        if (err)
                goto out;
 
-       bind_caller_port_to_irqhandler(pdev->evtchn, pcifront_handler_aer, 
-               SA_SAMPLE_RANDOM, "pcifront", pdev); 
+       bind_evtchn_to_irqhandler(pdev->evtchn, pcifront_handler_aer, 
+               0, "pcifront", pdev); 
 
       do_publish:
        err = xenbus_transaction_start(&trans);
-- 
1.6.2.5


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel


 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.