git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
include
/
asm-powerpc
/
pci-bridge.h
diff --git
a/include/asm-powerpc/pci-bridge.h
b/include/asm-powerpc/pci-bridge.h
index
86ee46b
..
38de92d
100644
(file)
--- a/
include/asm-powerpc/pci-bridge.h
+++ b/
include/asm-powerpc/pci-bridge.h
@@
-22,7
+22,6
@@
struct pci_controller {
struct pci_bus *bus;
char is_dynamic;
struct pci_controller {
struct pci_bus *bus;
char is_dynamic;
- int node;
void *arch_data;
struct list_head list_node;
void *arch_data;
struct list_head list_node;
@@
-79,6
+78,12
@@
struct pci_dn {
struct iommu_table *iommu_table; /* for phb's or bridges */
struct pci_dev *pcidev; /* back-pointer to the pci device */
struct device_node *node; /* back-pointer to the device_node */
struct iommu_table *iommu_table; /* for phb's or bridges */
struct pci_dev *pcidev; /* back-pointer to the pci device */
struct device_node *node; /* back-pointer to the device_node */
+#ifdef CONFIG_PPC_ISERIES
+ struct list_head Device_List;
+ int Irq; /* Assigned IRQ */
+ int Flags; /* Possible flags(disable/bist)*/
+ u8 LogicalSlot; /* Hv Slot Index for Tces */
+#endif
u32 config_space[16]; /* saved PCI config space */
};
u32 config_space[16]; /* saved PCI config space */
};
@@
-166,12
+171,6
@@
static inline unsigned long pci_address_to_pio(phys_addr_t address)
#define PCI_PROBE_NORMAL 0 /* Do normal PCI probing */
#define PCI_PROBE_DEVTREE 1 /* Instantiate from device tree */
#define PCI_PROBE_NORMAL 0 /* Do normal PCI probing */
#define PCI_PROBE_DEVTREE 1 /* Instantiate from device tree */
-#ifdef CONFIG_NUMA
-#define PHB_SET_NODE(PHB, NODE) ((PHB)->node = (NODE))
-#else
-#define PHB_SET_NODE(PHB, NODE) ((PHB)->node = -1)
-#endif
-
#endif /* CONFIG_PPC64 */
#endif /* __KERNEL__ */
#endif
#endif /* CONFIG_PPC64 */
#endif /* __KERNEL__ */
#endif