diff options
-rw-r--r-- | drivers/acpi/numa.c | 4 | ||||
-rw-r--r-- | drivers/acpi/tables.c | 4 | ||||
-rw-r--r-- | include/linux/acpi.h | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c index bb6caab2432..44e411e78ed 100644 --- a/drivers/acpi/numa.c +++ b/drivers/acpi/numa.c | |||
@@ -48,7 +48,7 @@ int __cpuinitdata node_to_pxm_map[MAX_NUMNODES] | |||
48 | extern int __init acpi_table_parse_madt_family(char *id, | 48 | extern int __init acpi_table_parse_madt_family(char *id, |
49 | unsigned long madt_size, | 49 | unsigned long madt_size, |
50 | int entry_id, | 50 | int entry_id, |
51 | acpi_madt_entry_handler handler, | 51 | acpi_table_entry_handler handler, |
52 | unsigned int max_entries); | 52 | unsigned int max_entries); |
53 | 53 | ||
54 | int __cpuinit pxm_to_node(int pxm) | 54 | int __cpuinit pxm_to_node(int pxm) |
@@ -208,7 +208,7 @@ static int __init acpi_parse_srat(struct acpi_table_header *table) | |||
208 | 208 | ||
209 | int __init | 209 | int __init |
210 | acpi_table_parse_srat(enum acpi_srat_type id, | 210 | acpi_table_parse_srat(enum acpi_srat_type id, |
211 | acpi_madt_entry_handler handler, unsigned int max_entries) | 211 | acpi_table_entry_handler handler, unsigned int max_entries) |
212 | { | 212 | { |
213 | return acpi_table_parse_madt_family(ACPI_SIG_SRAT, | 213 | return acpi_table_parse_madt_family(ACPI_SIG_SRAT, |
214 | sizeof(struct acpi_table_srat), id, | 214 | sizeof(struct acpi_table_srat), id, |
diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c index 2075ec7b827..f211fa35374 100644 --- a/drivers/acpi/tables.c +++ b/drivers/acpi/tables.c | |||
@@ -173,7 +173,7 @@ int __init | |||
173 | acpi_table_parse_madt_family(char *id, | 173 | acpi_table_parse_madt_family(char *id, |
174 | unsigned long madt_size, | 174 | unsigned long madt_size, |
175 | int entry_id, | 175 | int entry_id, |
176 | acpi_madt_entry_handler handler, | 176 | acpi_table_entry_handler handler, |
177 | unsigned int max_entries) | 177 | unsigned int max_entries) |
178 | { | 178 | { |
179 | struct acpi_table_header *madt = NULL; | 179 | struct acpi_table_header *madt = NULL; |
@@ -219,7 +219,7 @@ acpi_table_parse_madt_family(char *id, | |||
219 | 219 | ||
220 | int __init | 220 | int __init |
221 | acpi_table_parse_madt(enum acpi_madt_type id, | 221 | acpi_table_parse_madt(enum acpi_madt_type id, |
222 | acpi_madt_entry_handler handler, unsigned int max_entries) | 222 | acpi_table_entry_handler handler, unsigned int max_entries) |
223 | { | 223 | { |
224 | return acpi_table_parse_madt_family(ACPI_SIG_MADT, | 224 | return acpi_table_parse_madt_family(ACPI_SIG_MADT, |
225 | sizeof(struct acpi_table_madt), id, | 225 | sizeof(struct acpi_table_madt), id, |
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 815f1fb4ce2..15a23b6be44 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h | |||
@@ -75,7 +75,7 @@ enum acpi_address_range_id { | |||
75 | 75 | ||
76 | typedef int (*acpi_table_handler) (struct acpi_table_header *table); | 76 | typedef int (*acpi_table_handler) (struct acpi_table_header *table); |
77 | 77 | ||
78 | typedef int (*acpi_madt_entry_handler) (struct acpi_subtable_header *header, const unsigned long end); | 78 | typedef int (*acpi_table_entry_handler) (struct acpi_subtable_header *header, const unsigned long end); |
79 | 79 | ||
80 | char * __acpi_map_table (unsigned long phys_addr, unsigned long size); | 80 | char * __acpi_map_table (unsigned long phys_addr, unsigned long size); |
81 | unsigned long acpi_find_rsdp (void); | 81 | unsigned long acpi_find_rsdp (void); |
@@ -85,8 +85,8 @@ int acpi_numa_init (void); | |||
85 | 85 | ||
86 | int acpi_table_init (void); | 86 | int acpi_table_init (void); |
87 | int acpi_table_parse (char *id, acpi_table_handler handler); | 87 | int acpi_table_parse (char *id, acpi_table_handler handler); |
88 | int acpi_table_parse_madt (enum acpi_madt_type id, acpi_madt_entry_handler handler, unsigned int max_entries); | 88 | int acpi_table_parse_madt (enum acpi_madt_type id, acpi_table_entry_handler handler, unsigned int max_entries); |
89 | int acpi_table_parse_srat (enum acpi_srat_type id, acpi_madt_entry_handler handler, unsigned int max_entries); | 89 | int acpi_table_parse_srat (enum acpi_srat_type id, acpi_table_entry_handler handler, unsigned int max_entries); |
90 | int acpi_parse_mcfg (struct acpi_table_header *header); | 90 | int acpi_parse_mcfg (struct acpi_table_header *header); |
91 | void acpi_table_print_madt_entry (struct acpi_subtable_header *madt); | 91 | void acpi_table_print_madt_entry (struct acpi_subtable_header *madt); |
92 | void acpi_table_print_srat_entry (struct acpi_subtable_header *srat); | 92 | void acpi_table_print_srat_entry (struct acpi_subtable_header *srat); |