Commit 2160dc06 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] ppc64: Add exports and change some __init to __devinit for dynamic OF...

[PATCH] ppc64: Add exports and change some __init to __devinit for dynamic OF and pci hotplug, from John Rose and Linda Xie

From: Anton Blanchard <anton@samba.org>

Add exports and change some __init to __devinit for dynamic OF and pci
hotplug, from John Rose and Linda Xie
parent f6eb2bcd
...@@ -176,6 +176,7 @@ int pci_read_irq_line(struct pci_dev *pci_dev) ...@@ -176,6 +176,7 @@ int pci_read_irq_line(struct pci_dev *pci_dev)
pci_name(pci_dev), pci_dev->irq); pci_name(pci_dev), pci_dev->irq);
return 0; return 0;
} }
EXPORT_SYMBOL(pci_read_irq_line);
#define ISA_SPACE_MASK 0x1 #define ISA_SPACE_MASK 0x1
#define ISA_SPACE_IO 0x1 #define ISA_SPACE_IO 0x1
...@@ -512,7 +513,7 @@ void pcibios_name_device(struct pci_dev *dev) ...@@ -512,7 +513,7 @@ void pcibios_name_device(struct pci_dev *dev)
#endif #endif
} }
void __init pcibios_fixup_device_resources(struct pci_dev *dev, void __devinit pcibios_fixup_device_resources(struct pci_dev *dev,
struct pci_bus *bus) struct pci_bus *bus)
{ {
/* Update device resources. */ /* Update device resources. */
...@@ -531,6 +532,7 @@ void __init pcibios_fixup_device_resources(struct pci_dev *dev, ...@@ -531,6 +532,7 @@ void __init pcibios_fixup_device_resources(struct pci_dev *dev,
} }
} }
} }
EXPORT_SYMBOL(pcibios_fixup_device_resources);
void __devinit pcibios_fixup_bus(struct pci_bus *bus) void __devinit pcibios_fixup_bus(struct pci_bus *bus)
{ {
......
...@@ -380,6 +380,8 @@ int pci_domain_nr(struct pci_bus *bus) ...@@ -380,6 +380,8 @@ int pci_domain_nr(struct pci_bus *bus)
return hose->global_number; return hose->global_number;
} }
EXPORT_SYMBOL(pci_domain_nr);
/* Set the name of the bus as it appears in /proc/bus/pci */ /* Set the name of the bus as it appears in /proc/bus/pci */
int pci_name_bus(char *name, struct pci_bus *bus) int pci_name_bus(char *name, struct pci_bus *bus)
{ {
......
...@@ -1568,7 +1568,7 @@ finish_node(struct device_node *np, unsigned long mem_start, ...@@ -1568,7 +1568,7 @@ finish_node(struct device_node *np, unsigned long mem_start,
/* /*
* Find the interrupt parent of a node. * Find the interrupt parent of a node.
*/ */
static struct device_node * __init static struct device_node * __devinit
intr_parent(struct device_node *p) intr_parent(struct device_node *p)
{ {
phandle *parp; phandle *parp;
...@@ -1583,7 +1583,7 @@ intr_parent(struct device_node *p) ...@@ -1583,7 +1583,7 @@ intr_parent(struct device_node *p)
* Find out the size of each entry of the interrupts property * Find out the size of each entry of the interrupts property
* for a node. * for a node.
*/ */
static int __init static int __devinit
prom_n_intr_cells(struct device_node *np) prom_n_intr_cells(struct device_node *np)
{ {
struct device_node *p; struct device_node *p;
...@@ -1611,7 +1611,7 @@ prom_n_intr_cells(struct device_node *np) ...@@ -1611,7 +1611,7 @@ prom_n_intr_cells(struct device_node *np)
* Map an interrupt from a device up to the platform interrupt * Map an interrupt from a device up to the platform interrupt
* descriptor. * descriptor.
*/ */
static int __init static int __devinit
map_interrupt(unsigned int **irq, struct device_node **ictrler, map_interrupt(unsigned int **irq, struct device_node **ictrler,
struct device_node *np, unsigned int *ints, int nintrc) struct device_node *np, unsigned int *ints, int nintrc)
{ {
...@@ -2561,7 +2561,7 @@ static int of_finish_dynamic_node(struct device_node *node) ...@@ -2561,7 +2561,7 @@ static int of_finish_dynamic_node(struct device_node *node)
/* /*
* Find the device_node with a given phandle. * Find the device_node with a given phandle.
*/ */
static struct device_node * __init static struct device_node * __devinit
find_phandle(phandle ph) find_phandle(phandle ph)
{ {
struct device_node *np; struct device_node *np;
......
...@@ -141,6 +141,11 @@ unmap_bus_range(struct pci_bus *bus); ...@@ -141,6 +141,11 @@ unmap_bus_range(struct pci_bus *bus);
extern int extern int
remap_bus_range(struct pci_bus *bus); remap_bus_range(struct pci_bus *bus);
extern void
pcibios_fixup_device_resources(struct pci_dev *dev, struct pci_bus *bus);
extern int pci_read_irq_line(struct pci_dev *dev);
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* __PPC64_PCI_H */ #endif /* __PPC64_PCI_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment