Commit 5d357040 authored Oct 30, 2005 by Magnus Damm Committed by Linus Torvalds Oct 30, 2005

[PATCH] i386: srat on non-acpi hw fix



This patch adds a check for the return value of acpi_find_root_pointer().
Without this patch systems without ACPI support such as QEMU crashes when
booting a NUMA kernel with CONFIG_ACPI_SRAT=y.

Signed-off-by: Magnus Damm <magnus@valinux.co.jp>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent 6c180d94

arch/i386/kernel/srat.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -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__);