diff options
| author | Jan Beulich <jbeulich@suse.com> | 2011-12-13 11:46:21 +0100 |
|---|---|---|
| committer | Jan Beulich <jbeulich@suse.com> | 2011-12-13 11:46:21 +0100 |
| commit | 1b0a6f0d06c83d10a5583fe52c42bc45c2e277ab (patch) | |
| tree | 1035f46a187ed3a57493923c9bb66047958840b0 /xen/drivers/acpi | |
| parent | 3c419d3521b66c78e22da14fcf287b586e5df4b7 (diff) | |
| download | xen-1b0a6f0d06c83d10a5583fe52c42bc45c2e277ab.tar.gz xen-1b0a6f0d06c83d10a5583fe52c42bc45c2e277ab.tar.bz2 xen-1b0a6f0d06c83d10a5583fe52c42bc45c2e277ab.zip | |
ACPI: eliminate duplicate MADT parsing and unused SBF definitions
Use their proper counterparts in include/acpi/actbl*.h instead.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Keir Fraser <keir@xen.org>
Diffstat (limited to 'xen/drivers/acpi')
| -rw-r--r-- | xen/drivers/acpi/numa.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/xen/drivers/acpi/numa.c b/xen/drivers/acpi/numa.c index b3ea0902b6..e601813407 100644 --- a/xen/drivers/acpi/numa.c +++ b/xen/drivers/acpi/numa.c @@ -46,7 +46,7 @@ void __init acpi_table_print_srat_entry(struct acpi_subtable_header * header) switch (header->type) { - case ACPI_SRAT_PROCESSOR_AFFINITY: + case ACPI_SRAT_TYPE_CPU_AFFINITY: #ifdef ACPI_DEBUG_OUTPUT { struct acpi_srat_cpu_affinity *p = @@ -68,7 +68,7 @@ void __init acpi_table_print_srat_entry(struct acpi_subtable_header * header) #endif /* ACPI_DEBUG_OUTPUT */ break; - case ACPI_SRAT_MEMORY_AFFINITY: + case ACPI_SRAT_TYPE_MEMORY_AFFINITY: #ifdef ACPI_DEBUG_OUTPUT { struct acpi_srat_mem_affinity *p = @@ -194,8 +194,8 @@ int __init acpi_parse_srat(struct acpi_table_header *table) } int __init -acpi_table_parse_srat(enum acpi_srat_entry_id id, - acpi_madt_entry_handler handler, unsigned int max_entries) +acpi_table_parse_srat(int id, acpi_madt_entry_handler handler, + unsigned int max_entries) { return acpi_table_parse_entries(ACPI_SIG_SRAT, sizeof(struct acpi_table_srat), id, @@ -206,12 +206,13 @@ int __init acpi_numa_init(void) { /* SRAT: Static Resource Affinity Table */ if (!acpi_table_parse(ACPI_SIG_SRAT, acpi_parse_srat)) { - acpi_table_parse_srat(ACPI_SRAT_X2APIC_AFFINITY, - acpi_parse_x2apic_affinity, NR_CPUS); - acpi_table_parse_srat(ACPI_SRAT_PROCESSOR_AFFINITY, - acpi_parse_processor_affinity, - NR_CPUS); - acpi_table_parse_srat(ACPI_SRAT_MEMORY_AFFINITY, acpi_parse_memory_affinity, NR_NODE_MEMBLKS); // IA64 specific + acpi_table_parse_srat(ACPI_SRAT_TYPE_X2APIC_CPU_AFFINITY, + acpi_parse_x2apic_affinity, NR_CPUS); + acpi_table_parse_srat(ACPI_SRAT_TYPE_CPU_AFFINITY, + acpi_parse_processor_affinity, NR_CPUS); + acpi_table_parse_srat(ACPI_SRAT_TYPE_MEMORY_AFFINITY, + acpi_parse_memory_affinity, + NR_NODE_MEMBLKS); } /* SLIT: System Locality Information Table */ |