3 files changed, 5 insertions, 13 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? */