Merge tag 'powerpc-4.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[linux-2.6-block.git] / arch / powerpc / include / asm / pnv-pci.h

diff --git a/arch/powerpc/include/asm/pnv-pci.h b/arch/powerpc/include/asm/pnv-pci.h
index 1b46b52d3212f40ca4038750871cf45e98d33e00..696438f09aeab1399683cd8e504ddb317b092caf 100644 (file)
--- a/arch/powerpc/include/asm/pnv-pci.h
+++ b/arch/powerpc/include/asm/pnv-pci.h
@@ -16,7 +16,7 @@
 #include <misc/cxl-base.h>
 #include <asm/opal-api.h>
 
-#define PCI_SLOT_ID_PREFIX     0x8000000000000000
+#define PCI_SLOT_ID_PREFIX     (1UL << 63)
 #define PCI_SLOT_ID(phb_id, bdfn)      \
        (PCI_SLOT_ID_PREFIX | ((uint64_t)(bdfn) << 16) | (phb_id))
 
@@ -63,6 +63,8 @@ struct pnv_php_slot {
 #define PNV_PHP_STATE_POPULATED                2
 #define PNV_PHP_STATE_OFFLINE          3
        int                             state;
+       int                             irq;
+       struct workqueue_struct         *wq;
        struct device_node              *dn;
        struct pci_dev                  *pdev;
        struct pci_bus                  *bus;