Commit e681f1d3 authored by Len Brown's avatar Len Brown

Merge intel.com:/home/lenb/src/linux-acpi-test-2.6.0

into intel.com:/home/lenb/src/linux-acpi-test-2.6.1
parents 4775e46c d0df0dc6
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/acpi.h> #include <linux/acpi.h>
#include <acpi/acpi_bus.h> #include <acpi/acpi_bus.h>
#include <acpi/acmacros.h>
extern int __init acpi_table_parse_madt_family (enum acpi_table_id id, unsigned long madt_size, int entry_id, acpi_madt_entry_handler handler, unsigned int max_entries); extern int __init acpi_table_parse_madt_family (enum acpi_table_id id, unsigned long madt_size, int entry_id, acpi_madt_entry_handler handler, unsigned int max_entries);
...@@ -46,9 +47,9 @@ acpi_table_print_srat_entry ( ...@@ -46,9 +47,9 @@ acpi_table_print_srat_entry (
{ {
struct acpi_table_processor_affinity *p = struct acpi_table_processor_affinity *p =
(struct acpi_table_processor_affinity*) header; (struct acpi_table_processor_affinity*) header;
printk(KERN_INFO PREFIX "SRAT Processor (id[0x%02x] eid[0x%02x]) in proximity domain %d %s\n", ACPI_DEBUG_PRINT((ACPI_DB_INFO "SRAT Processor (id[0x%02x] eid[0x%02x]) in proximity domain %d %s\n",
p->apic_id, p->lsapic_eid, p->proximity_domain, p->apic_id, p->lsapic_eid, p->proximity_domain,
p->flags.enabled?"enabled":"disabled"); p->flags.enabled?"enabled":"disabled"));
} }
break; break;
...@@ -56,11 +57,11 @@ acpi_table_print_srat_entry ( ...@@ -56,11 +57,11 @@ acpi_table_print_srat_entry (
{ {
struct acpi_table_memory_affinity *p = struct acpi_table_memory_affinity *p =
(struct acpi_table_memory_affinity*) header; (struct acpi_table_memory_affinity*) header;
printk(KERN_INFO PREFIX "SRAT Memory (0x%08x%08x length 0x%08x%08x type 0x%x) in proximity domain %d %s%s\n", ACPI_DEBUG_PRINT((ACPI_DB_INFO "SRAT Memory (0x%08x%08x length 0x%08x%08x type 0x%x) in proximity domain %d %s%s\n",
p->base_addr_hi, p->base_addr_lo, p->length_hi, p->length_lo, p->base_addr_hi, p->base_addr_lo, p->length_hi, p->length_lo,
p->memory_type, p->proximity_domain, p->memory_type, p->proximity_domain,
p->flags.enabled ? "enabled" : "disabled", p->flags.enabled ? "enabled" : "disabled",
p->flags.hot_pluggable ? " hot-pluggable" : ""); p->flags.hot_pluggable ? " hot-pluggable" : ""));
} }
break; break;
...@@ -97,7 +98,7 @@ acpi_parse_slit (unsigned long phys_addr, unsigned long size) ...@@ -97,7 +98,7 @@ acpi_parse_slit (unsigned long phys_addr, unsigned long size)
static int __init static int __init
acpi_parse_processor_affinity (acpi_table_entry_header *header) acpi_parse_processor_affinity (acpi_table_entry_header *header)
{ {
struct acpi_table_processor_affinity *processor_affinity = NULL; struct acpi_table_processor_affinity *processor_affinity;
processor_affinity = (struct acpi_table_processor_affinity*) header; processor_affinity = (struct acpi_table_processor_affinity*) header;
if (!processor_affinity) if (!processor_affinity)
...@@ -115,7 +116,7 @@ acpi_parse_processor_affinity (acpi_table_entry_header *header) ...@@ -115,7 +116,7 @@ acpi_parse_processor_affinity (acpi_table_entry_header *header)
static int __init static int __init
acpi_parse_memory_affinity (acpi_table_entry_header *header) acpi_parse_memory_affinity (acpi_table_entry_header *header)
{ {
struct acpi_table_memory_affinity *memory_affinity = NULL; struct acpi_table_memory_affinity *memory_affinity;
memory_affinity = (struct acpi_table_memory_affinity*) header; memory_affinity = (struct acpi_table_memory_affinity*) header;
if (!memory_affinity) if (!memory_affinity)
...@@ -133,7 +134,7 @@ acpi_parse_memory_affinity (acpi_table_entry_header *header) ...@@ -133,7 +134,7 @@ acpi_parse_memory_affinity (acpi_table_entry_header *header)
static int __init static int __init
acpi_parse_srat (unsigned long phys_addr, unsigned long size) acpi_parse_srat (unsigned long phys_addr, unsigned long size)
{ {
struct acpi_table_srat *srat = NULL; struct acpi_table_srat *srat;
if (!phys_addr || !size) if (!phys_addr || !size)
return -EINVAL; return -EINVAL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment