diff options
| author | Alex Williamson <alex.williamson@hp.com> | 2008-02-14 09:34:27 -0700 |
|---|---|---|
| committer | Alex Williamson <alex.williamson@hp.com> | 2008-02-14 09:34:27 -0700 |
| commit | e38c4f55fe6ef6c393388ae181630ab3a92f77dd (patch) | |
| tree | 24970faea32f21f96b9048f8a36c8e8d9dafe2b2 /unmodified_drivers/linux-2.6/platform-pci/platform-pci.c | |
| parent | 03c9b741df33f676c99c7885ca7f795190df37d5 (diff) | |
| parent | df5b25e9af9248d8e00d0ef7e4ce3eec9eb44f97 (diff) | |
| download | xen-e38c4f55fe6ef6c393388ae181630ab3a92f77dd.tar.gz xen-e38c4f55fe6ef6c393388ae181630ab3a92f77dd.tar.bz2 xen-e38c4f55fe6ef6c393388ae181630ab3a92f77dd.zip | |
merge with xen-unstable.hg
Diffstat (limited to 'unmodified_drivers/linux-2.6/platform-pci/platform-pci.c')
| -rw-r--r-- | unmodified_drivers/linux-2.6/platform-pci/platform-pci.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c index 7a512073d2..3d3a4c79a1 100644 --- a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c +++ b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c @@ -249,6 +249,7 @@ static int set_callback_via(uint64_t via) int xen_irq_init(struct pci_dev *pdev); int xenbus_init(void); int xen_reboot_init(void); +int xen_panic_handler_init(void); int gnttab_init(void); static int __devinit platform_pci_init(struct pci_dev *pdev, @@ -317,6 +318,9 @@ static int __devinit platform_pci_init(struct pci_dev *pdev, if ((ret = xen_reboot_init())) goto out; + if ((ret = xen_panic_handler_init())) + goto out; + out: if (ret) { release_mem_region(mmio_addr, mmio_len); |