Skip to content

Commit

Permalink
[PATCH] i386: srat on non-acpi hw fix
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Magnus Damm authored and Linus Torvalds committed Oct 31, 2005
1 parent 6c180d9 commit 5d35704
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion arch/i386/kernel/srat.c
Original file line number Diff line number Diff line change
Expand Up @@ -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__);
Expand Down

0 comments on commit 5d35704

Please sign in to comment.