ppc64: updates from Rochester

diff --git a/arch/ppc64/kernel/pci.c b/arch/ppc64/kernel/pci.c
index 7cc4bfb9a4337b3f62953c9f5b2bc2ec23105985..2cafeb126f6edd29fa37b51d3798e2e21ae8e959 100644 (file)
--- a/arch/ppc64/kernel/pci.c
+++ b/arch/ppc64/kernel/pci.c
@@ -490,7 +490,8 @@ pcibios_init(void)
 #endif
 
        /* Cache the location of the ISA bridge (if we have one) */
-       if (ppc64_isabridge_dev = pci_find_class(PCI_CLASS_BRIDGE_ISA << 8, NULL))
+       ppc64_isabridge_dev = pci_find_class(PCI_CLASS_BRIDGE_ISA << 8, NULL);
+       if (ppc64_isabridge_dev != NULL)
                printk("ISA bridge at %s\n", ppc64_isabridge_dev->slot_name);
 
        printk("PCI: Probing PCI hardware done\n");
@@ -514,11 +515,11 @@ unsigned long resource_fixup(struct pci_dev * dev, struct resource * res,
 
 void __init pcibios_fixup_bus(struct pci_bus *bus)
 {
+#ifndef CONFIG_PPC_ISERIES
        struct pci_controller *phb = PCI_GET_PHB_PTR(bus);
        struct resource *res;
        int i;
 
-#ifndef CONFIG_PPC_ISERIES
        if (bus->parent == NULL) {
                /* This is a host bridge - fill in its resources */
                phb->bus = bus;

diff --git a/arch/ppc64/kernel/ppc_ksyms.c b/arch/ppc64/kernel/ppc_ksyms.c
index 133b2566b0cb8a7ae04de8fb798fa08355c365d3..3863f1fd0f9ede7cdbf97b35d0c4c5d129b4f0b9 100644 (file)
--- a/arch/ppc64/kernel/ppc_ksyms.c
+++ b/arch/ppc64/kernel/ppc_ksyms.c
@@ -50,6 +50,7 @@
 /* Tell string.h we don't want memcpy etc. as cpp defines */
 #define EXPORT_SYMTAB_STROPS
 
+extern int sys_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg);
 extern int sys_sigreturn(struct pt_regs *regs);
 extern int do_signal(sigset_t *, struct pt_regs *);
 extern int register_ioctl32_conversion(unsigned int cmd, int (*handler)(unsigned int, unsigned int, unsigned long, struct file *));
@@ -64,6 +65,7 @@ extern struct pci_dev * iSeries_veth_dev;
 extern struct pci_dev * iSeries_vio_dev;
 
 EXPORT_SYMBOL(do_signal);
+EXPORT_SYMBOL(sys_ioctl);
 EXPORT_SYMBOL(sys_sigreturn);
 EXPORT_SYMBOL(enable_irq);
 EXPORT_SYMBOL(disable_irq);
@@ -154,15 +156,17 @@ EXPORT_SYMBOL(pci_unmap_single);
 EXPORT_SYMBOL(pci_map_sg);
 EXPORT_SYMBOL(pci_unmap_sg);
 #ifdef CONFIG_PPC_ISERIES
-EXPORT_SYMBOL(iSeries_Write_Long);
 EXPORT_SYMBOL(iSeries_GetLocationData);
-EXPORT_SYMBOL(iSeries_Read_Long);
 EXPORT_SYMBOL(iSeries_Device_ToggleReset);
-EXPORT_SYMBOL(iSeries_Write_Word);
+EXPORT_SYMBOL(iSeries_memset_io);
+EXPORT_SYMBOL(iSeries_memcpy_toio);
 EXPORT_SYMBOL(iSeries_memcpy_fromio);
-EXPORT_SYMBOL(iSeries_Read_Word);
 EXPORT_SYMBOL(iSeries_Read_Byte);
+EXPORT_SYMBOL(iSeries_Read_Word);
+EXPORT_SYMBOL(iSeries_Read_Long);
 EXPORT_SYMBOL(iSeries_Write_Byte);
+EXPORT_SYMBOL(iSeries_Write_Word);
+EXPORT_SYMBOL(iSeries_Write_Long);
 #endif /* CONFIG_PPC_ISERIES */
 #ifndef CONFIG_PPC_ISERIES
 EXPORT_SYMBOL(eeh_check_failure);