diff options
| author | Fenghua Yu <fenghua.yu@intel.com> | 2008-06-09 16:48:18 -0700 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-06-11 19:13:46 -0400 |
| commit | 39b8931b5cad9a7cbcd2394a40a088311e783a82 (patch) | |
| tree | 4db8369a3d5cc54a61942f38de9eb392e7e5bc60 /arch/ia64 | |
| parent | 36d872a370d3d10e5a7faa9dcacce744260fb13b (diff) | |
| download | linux-39b8931b5cad9a7cbcd2394a40a088311e783a82.tar.gz linux-39b8931b5cad9a7cbcd2394a40a088311e783a82.tar.bz2 linux-39b8931b5cad9a7cbcd2394a40a088311e783a82.zip | |
ACPI: handle invalid ACPI SLIT table
This is a SLIT sanity checking patch. It moves slit_valid() function to
generic ACPI code and does sanity checking for both x86 and ia64. It sets up
node_distance with LOCAL_DISTANCE and REMOTE_DISTANCE when hitting invalid
SLIT table on ia64. It also cleans up unused variable localities in
acpi_parse_slit() on x86.
Signed-off-by: Fenghua Yu <fenghua.yu@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/kernel/acpi.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c index 853d1f11be00..43687cc60dfb 100644 --- a/arch/ia64/kernel/acpi.c +++ b/arch/ia64/kernel/acpi.c @@ -465,7 +465,6 @@ void __init acpi_numa_slit_init(struct acpi_table_slit *slit) printk(KERN_ERR "ACPI 2.0 SLIT: size mismatch: %d expected, %d actual\n", len, slit->header.length); - memset(numa_slit, 10, sizeof(numa_slit)); return; } slit_table = slit; @@ -574,8 +573,14 @@ void __init acpi_numa_arch_fixup(void) printk(KERN_INFO "Number of memory chunks in system = %d\n", num_node_memblks); - if (!slit_table) + if (!slit_table) { + for (i = 0; i < MAX_NUMNODES; i++) + for (j = 0; j < MAX_NUMNODES; j++) + node_distance(i, j) = i == j ? LOCAL_DISTANCE : + REMOTE_DISTANCE; return; + } + memset(numa_slit, -1, sizeof(numa_slit)); for (i = 0; i < slit_table->locality_count; i++) { if (!pxm_bit_test(i)) |