Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze

Pull microblaze update from Michal Simek:
 "This fixes noMMU kernel and I have also added defconfig updates which
  fix issue with one external dependency and enable all xilinx device
  drivers for 0-day testing system.

  Additionally wire up finit_module system call, and do highmem fixup
  and pci warnings reported by the 0-day testing system"

* 'next' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: Update microblaze defconfigs
  microblaze: Fix pci compilation and sparse warnings
  microblaze: Add finit_module syscall
  microblaze: Kill __kmap_atomic()
  microblaze: Change section flags for noMMU
  microblaze: Microblaze wants sys_fork for noMMU too

1 files changed, 5 insertions, 6 deletions

diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c
index 2a20f1ff4c59..96416553cb36 100644
--- a/arch/microblaze/pci/pci-common.c
+++ b/arch/microblaze/pci/pci-common.c
@@ -287,7 +287,7 @@ static struct resource *__pci_mmap_make_offset(struct pci_dev *dev,
         unsigned long io_offset = 0;
         int i, res_bit;
 
-        if (hose == 0)
+        if (!hose)
                 return NULL;            /* should never happen */
 
         /* If memory, add on the PCI bridge address offset */
@@ -821,8 +821,6 @@ void pci_process_bridge_OF_ranges(struct pci_controller *hose,
 /* Decide whether to display the domain number in /proc */
 int pci_proc_domain(struct pci_bus *bus)
 {
-        struct pci_controller *hose = pci_bus_to_host(bus);
-
         return 0;
 }
 
@@ -1123,7 +1121,7 @@ static int __init reparent_resources(struct resource *parent,
  *          as well.
  */
 
-void pcibios_allocate_bus_resources(struct pci_bus *bus)
+static void pcibios_allocate_bus_resources(struct pci_bus *bus)
 {
         struct pci_bus *b;
         int i;
@@ -1178,7 +1176,7 @@ void pcibios_allocate_bus_resources(struct pci_bus *bus)
                 }
                 printk(KERN_WARNING "PCI: Cannot allocate resource region "
                        "%d of PCI bridge %d, will remap\n", i, bus->number);
-clear_resource:
+
                 res->start = res->end = 0;
                 res->flags = 0;
         }
@@ -1433,7 +1431,8 @@ static void pcibios_setup_phb_resources(struct pci_controller *hose,
                 res->end = res->start + IO_SPACE_LIMIT;
                 res->flags = IORESOURCE_IO;
         }
-        pci_add_resource_offset(resources, res, hose->io_base_virt - _IO_BASE);
+        pci_add_resource_offset(resources, res,
+                (__force resource_size_t)(hose->io_base_virt - _IO_BASE));
 
         pr_debug("PCI: PHB IO resource    = %016llx-%016llx [%lx]\n",
                  (unsigned long long)res->start,