Merge tag 'v3.6-rc4'

Merge 3.6-rc4 to get latest OMAP and device tree fixes.

1 files changed, 8 insertions, 4 deletions

diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
index e56f3be7b07d..cb31298ca684 100644
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
@@ -237,6 +237,8 @@ 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)
@@ -250,8 +252,8 @@ acpi_parse_memory_affinity(struct acpi_subtable_header * header,
         acpi_table_print_srat_entry(header);
 
         /* let architecture-dependent part to do it */
-        acpi_numa_memory_affinity_init(memory_affinity);
-
+        if (!acpi_numa_memory_affinity_init(memory_affinity))
+                parsed_numa_memblks++;
         return 0;
 }
 
@@ -304,8 +306,10 @@ int __init acpi_numa_init(void)
 
         acpi_numa_arch_fixup();
 
-        if (cnt <= 0)
-                return cnt ?: -ENOENT;
+        if (cnt < 0)
+                return cnt;
+        else if (!parsed_numa_memblks)
+                return -ENOENT;
         return 0;
 }