5 files changed, 35 insertions, 47 deletions

diff --git a/arch/ia64/kernel/acpi-ext.c b/arch/ia64/kernel/acpi-ext.c
index 8b9318d311a0..bd09bf74f187 100644
--- a/arch/ia64/kernel/acpi-ext.c
+++ b/arch/ia64/kernel/acpi-ext.c
@@ -69,10 +69,10 @@ static acpi_status find_csr_space(struct acpi_resource *resource, void *data)
         status = acpi_resource_to_address64(resource, &addr);
         if (ACPI_SUCCESS(status) &&
             addr.resource_type == ACPI_MEMORY_RANGE &&
-            addr.address_length &&
+            addr.address.address_length &&
             addr.producer_consumer == ACPI_CONSUMER) {
-                space->base = addr.minimum;
-                space->length = addr.address_length;
+                space->base = addr.address.minimum;
+                space->length = addr.address.address_length;
                 return AE_CTRL_TERMINATE;
         }
         return AE_OK;           /* keep looking */
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index e795cb848154..2c4498919d3c 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -380,9 +380,6 @@ static void __init acpi_madt_oem_check(char *oem_id, char *oem_table_id)
 
 static int __init acpi_parse_madt(struct acpi_table_header *table)
 {
-        if (!table)
-                return -EINVAL;
-
         acpi_madt = (struct acpi_table_madt *)table;
 
         acpi_madt_rev = acpi_madt->header.revision;
@@ -645,9 +642,6 @@ static int __init acpi_parse_fadt(struct acpi_table_header *table)
         struct acpi_table_header *fadt_header;
         struct acpi_table_fadt *fadt;
 
-        if (!table)
-                return -EINVAL;
-
         fadt_header = (struct acpi_table_header *)table;
         if (fadt_header->revision != 3)
                 return -ENODEV; /* Only deal with ACPI 2.0 FADT */
diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
index 24603be24c14..29754aae5177 100644
--- a/arch/ia64/kernel/module.c
+++ b/arch/ia64/kernel/module.c
@@ -305,14 +305,12 @@ plt_target (struct plt_entry *plt)
 #endif /* !USE_BRL */
 
 void
-module_free (struct module *mod, void *module_region)
+module_arch_freeing_init (struct module *mod)
 {
-        if (mod && mod->arch.init_unw_table &&
-            module_region == mod->module_init) {
+        if (mod->arch.init_unw_table) {
                 unw_remove_unwind_table(mod->arch.init_unw_table);
                 mod->arch.init_unw_table = NULL;
         }
-        vfree(module_region);
 }
 
 /* Have we already seen one of these relocations? */
diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
index 7225dad87094..ba5ba7accd0d 100644
--- a/arch/ia64/mm/fault.c
+++ b/arch/ia64/mm/fault.c
@@ -172,6 +172,8 @@ retry:
                  */
                 if (fault & VM_FAULT_OOM) {
                         goto out_of_memory;
+                } else if (fault & VM_FAULT_SIGSEGV) {
+                        goto bad_area;
                 } else if (fault & VM_FAULT_SIGBUS) {
                         signal = SIGBUS;
                         goto bad_area;
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index 291a582777cf..48cc65705db4 100644
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -188,12 +188,12 @@ static u64 add_io_space(struct pci_root_info *info,
 
         name = (char *)(iospace + 1);
 
-        min = addr->minimum;
-        max = min + addr->address_length - 1;
+        min = addr->address.minimum;
+        max = min + addr->address.address_length - 1;
         if (addr->info.io.translation_type == ACPI_SPARSE_TRANSLATION)
                 sparse = 1;
 
-        space_nr = new_space(addr->translation_offset, sparse);
+        space_nr = new_space(addr->address.translation_offset, sparse);
         if (space_nr == ~0)
                 goto free_resource;
 
@@ -247,7 +247,7 @@ static acpi_status resource_to_window(struct acpi_resource *resource,
         if (ACPI_SUCCESS(status) &&
             (addr->resource_type == ACPI_MEMORY_RANGE ||
              addr->resource_type == ACPI_IO_RANGE) &&
-            addr->address_length &&
+            addr->address.address_length &&
             addr->producer_consumer == ACPI_PRODUCER)
                 return AE_OK;
 
@@ -284,7 +284,7 @@ static acpi_status add_window(struct acpi_resource *res, void *data)
         if (addr.resource_type == ACPI_MEMORY_RANGE) {
                 flags = IORESOURCE_MEM;
                 root = &iomem_resource;
-                offset = addr.translation_offset;
+                offset = addr.address.translation_offset;
         } else if (addr.resource_type == ACPI_IO_RANGE) {
                 flags = IORESOURCE_IO;
                 root = &ioport_resource;
@@ -297,8 +297,8 @@ static acpi_status add_window(struct acpi_resource *res, void *data)
         resource = &info->res[info->res_num];
         resource->name = info->name;
         resource->flags = flags;
-        resource->start = addr.minimum + offset;
-        resource->end = resource->start + addr.address_length - 1;
+        resource->start = addr.address.minimum + offset;
+        resource->end = resource->start + addr.address.address_length - 1;
         info->res_offset[info->res_num] = offset;
 
         if (insert_resource(root, resource)) {
@@ -487,45 +487,39 @@ int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge)
         return 0;
 }
 
-static int is_valid_resource(struct pci_dev *dev, int idx)
+void pcibios_fixup_device_resources(struct pci_dev *dev)
 {
-        unsigned int i, type_mask = IORESOURCE_IO | IORESOURCE_MEM;
-        struct resource *devr = &dev->resource[idx], *busr;
+        int idx;
 
         if (!dev->bus)
-                return 0;
-
-        pci_bus_for_each_resource(dev->bus, busr, i) {
-                if (!busr || ((busr->flags ^ devr->flags) & type_mask))
-                        continue;
-                if ((devr->start) && (devr->start >= busr->start) &&
-                                (devr->end <= busr->end))
-                        return 1;
-        }
-        return 0;
-}
+                return;
 
-static void pcibios_fixup_resources(struct pci_dev *dev, int start, int limit)
-{
-        int i;
+        for (idx = 0; idx < PCI_BRIDGE_RESOURCES; idx++) {
+                struct resource *r = &dev->resource[idx];
 
-        for (i = start; i < limit; i++) {
-                if (!dev->resource[i].flags)
+                if (!r->flags || r->parent || !r->start)
                         continue;
-                if ((is_valid_resource(dev, i)))
-                        pci_claim_resource(dev, i);
-        }
-}
 
-void pcibios_fixup_device_resources(struct pci_dev *dev)
-{
-        pcibios_fixup_resources(dev, 0, PCI_BRIDGE_RESOURCES);
+                pci_claim_resource(dev, idx);
+        }
 }
 EXPORT_SYMBOL_GPL(pcibios_fixup_device_resources);
 
 static void pcibios_fixup_bridge_resources(struct pci_dev *dev)
 {
-        pcibios_fixup_resources(dev, PCI_BRIDGE_RESOURCES, PCI_NUM_RESOURCES);
+        int idx;
+
+        if (!dev->bus)
+                return;
+
+        for (idx = PCI_BRIDGE_RESOURCES; idx < PCI_NUM_RESOURCES; idx++) {
+                struct resource *r = &dev->resource[idx];
+
+                if (!r->flags || r->parent || !r->start)
+                        continue;
+
+                pci_claim_bridge_resource(dev, idx);
+        }
 }
 
 /*