From 8f0640ca65f5b9466d877b269e3499f7e0c778c7 Mon Sep 17 00:00:00 2001
From: Magnus Damm <magnus@valinux.co.jp>
Date: Sun, 30 Oct 2005 14:59:48 -0800
Subject: [PATCH] --- yaml --- r: 11774 b: refs/heads/master c:
 5d35704028d09a183448daceab5dcb94f21a3645 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/arch/i386/kernel/srat.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1862093af10e..0684a6d278ee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c180d94abdcfb77a2fe4275bd03687fa159acd7
+refs/heads/master: 5d35704028d09a183448daceab5dcb94f21a3645
diff --git a/trunk/arch/i386/kernel/srat.c b/trunk/arch/i386/kernel/srat.c
index 516bf5653b02..8de658db8146 100644
--- a/trunk/arch/i386/kernel/srat.c
+++ b/trunk/arch/i386/kernel/srat.c
@@ -327,7 +327,12 @@ int __init get_memcfg_from_srat(void)
 	int tables = 0;
 	int i = 0;
 
-	acpi_find_root_pointer(ACPI_PHYSICAL_ADDRESSING, rsdp_address);
+	if (ACPI_FAILURE(acpi_find_root_pointer(ACPI_PHYSICAL_ADDRESSING,
+						rsdp_address))) {
+		printk("%s: System description tables not found\n",
+		       __FUNCTION__);
+		goto out_err;
+	}
 
 	if (rsdp_address->pointer_type == ACPI_PHYSICAL_POINTER) {
 		printk("%s: assigning address to rsdp\n", __FUNCTION__);