Patched in Tegra support.

1 files changed, 4 insertions, 14 deletions

diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
index cb31298ca68..3b5c3189fd9 100644
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
@@ -45,8 +45,6 @@ static int pxm_to_node_map[MAX_PXM_DOMAINS]
 static int node_to_pxm_map[MAX_NUMNODES]
                         = { [0 ... MAX_NUMNODES - 1] = PXM_INVAL };
 
-unsigned char acpi_srat_revision __initdata;
-
 int pxm_to_node(int pxm)
 {
         if (pxm < 0)
@@ -237,8 +235,6 @@ acpi_parse_processor_affinity(struct acpi_subtable_header *header,
         return 0;
 }
 
-static int __initdata parsed_numa_memblks;
-
 static int __init
 acpi_parse_memory_affinity(struct acpi_subtable_header * header,
                            const unsigned long end)
@@ -252,20 +248,16 @@ acpi_parse_memory_affinity(struct acpi_subtable_header * header,
         acpi_table_print_srat_entry(header);
 
         /* let architecture-dependent part to do it */
-        if (!acpi_numa_memory_affinity_init(memory_affinity))
-                parsed_numa_memblks++;
+        acpi_numa_memory_affinity_init(memory_affinity);
+
         return 0;
 }
 
 static int __init acpi_parse_srat(struct acpi_table_header *table)
 {
-        struct acpi_table_srat *srat;
         if (!table)
                 return -EINVAL;
 
-        srat = (struct acpi_table_srat *)table;
-        acpi_srat_revision = srat->header.revision;
-
         /* Real work done in acpi_table_parse_srat below. */
 
         return 0;
@@ -306,10 +298,8 @@ int __init acpi_numa_init(void)
 
         acpi_numa_arch_fixup();
 
-        if (cnt < 0)
-                return cnt;
-        else if (!parsed_numa_memblks)
-                return -ENOENT;
+        if (cnt <= 0)
+                return cnt ?: -ENOENT;
         return 0;
 }