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

diff --combined arch/microblaze/pci/pci-common.c
index 2a20f1f,e84b129..9641655
--- 1/arch/microblaze/pci/pci-common.c
--- 2/arch/microblaze/pci/pci-common.c
+++ b/arch/microblaze/pci/pci-common.c
@@@ -287,7 -287,7 +287,7 @@@ static struct resource *__pci_mmap_make
        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 */
@@@ -655,8 -655,9 +655,8 @@@ void pci_resource_to_user(const struct 
   *   - Some 32 bits platforms such as 4xx can have physical space larger than
   *     32 bits so we need to use 64 bits values for the parsing
   */
 -void __devinit pci_process_bridge_OF_ranges(struct pci_controller *hose,
 -                                          struct device_node *dev,
 -                                          int primary)
 +void pci_process_bridge_OF_ranges(struct pci_controller *hose,
 +                                struct device_node *dev, int primary)
  {
        const u32 *ranges;
        int rlen;
@@@ -821,15 -822,13 +821,13 @@@
  /* 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;
  }
  
  /* This header fixup will do the resource fixup for all devices as they are
   * probed, but not for bridge ranges
   */
 -static void __devinit pcibios_fixup_resources(struct pci_dev *dev)
 +static void pcibios_fixup_resources(struct pci_dev *dev)
  {
        struct pci_controller *hose = pci_bus_to_host(dev->bus);
        int i;
@@@ -870,8 -869,8 +868,8 @@@ DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PC
   * things go more smoothly when it gets it right. It should covers cases such
   * as Apple "closed" bridge resources and bare-metal pSeries unassigned bridges
   */
 -static int __devinit pcibios_uninitialized_bridge_resource(struct pci_bus *bus,
 -                                                         struct resource *res)
 +static int pcibios_uninitialized_bridge_resource(struct pci_bus *bus,
 +                                               struct resource *res)
  {
        struct pci_controller *hose = pci_bus_to_host(bus);
        struct pci_dev *dev = bus->self;
@@@ -932,7 -931,7 +930,7 @@@
  }
  
  /* Fixup resources of a PCI<->PCI bridge */
 -static void __devinit pcibios_fixup_bridge(struct pci_bus *bus)
 +static void pcibios_fixup_bridge(struct pci_bus *bus)
  {
        struct resource *res;
        int i;
@@@ -969,14 -968,14 +967,14 @@@
        }
  }
  
 -void __devinit pcibios_setup_bus_self(struct pci_bus *bus)
 +void pcibios_setup_bus_self(struct pci_bus *bus)
  {
        /* Fix up the bus resources for P2P bridges */
        if (bus->self != NULL)
                pcibios_fixup_bridge(bus);
  }
  
 -void __devinit pcibios_setup_bus_devices(struct pci_bus *bus)
 +void pcibios_setup_bus_devices(struct pci_bus *bus)
  {
        struct pci_dev *dev;
  
@@@ -1001,7 -1000,7 +999,7 @@@
        }
  }
  
 -void __devinit pcibios_fixup_bus(struct pci_bus *bus)
 +void pcibios_fixup_bus(struct pci_bus *bus)
  {
        /* When called from the generic PCI probe, read PCI<->PCI bridge
         * bases. This is -not- called when generating the PCI tree from
@@@ -1123,7 -1122,7 +1121,7 @@@ static int __init reparent_resources(st
   *        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 -1177,7 +1176,7 @@@
                }
                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;
        }
@@@ -1187,7 -1186,7 +1185,7 @@@
                pcibios_allocate_bus_resources(b);
  }
  
 -static inline void __devinit alloc_resource(struct pci_dev *dev, int idx)
 +static inline void alloc_resource(struct pci_dev *dev, int idx)
  {
        struct resource *pr, *r = &dev->resource[idx];
  
@@@ -1350,7 -1349,7 +1348,7 @@@ void __init pcibios_resource_survey(voi
   * rest of the code later, for now, keep it as-is as our main
   * resource allocation function doesn't deal with sub-trees yet.
   */
 -void __devinit pcibios_claim_one_bus(struct pci_bus *bus)
 +void pcibios_claim_one_bus(struct pci_bus *bus)
  {
        struct pci_dev *dev;
        struct pci_bus *child_bus;
@@@ -1409,8 -1408,7 +1407,8 @@@ int pcibios_enable_device(struct pci_de
        return pci_enable_resources(dev, mask);
  }
  
 -static void __devinit pcibios_setup_phb_resources(struct pci_controller *hose, struct list_head *resources)
 +static void pcibios_setup_phb_resources(struct pci_controller *hose,
 +                                      struct list_head *resources)
  {
        unsigned long io_offset;
        struct resource *res;
@@@ -1433,7 -1431,8 +1431,8 @@@
                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,
@@@ -1477,7 -1476,7 +1476,7 @@@ struct device_node *pcibios_get_phb_of_
        return of_node_get(hose->dn);
  }
  
 -static void __devinit pcibios_scan_phb(struct pci_controller *hose)
 +static void pcibios_scan_phb(struct pci_controller *hose)
  {
        LIST_HEAD(resources);
        struct pci_bus *bus;