diff options
author | Huang, Ying <ying.huang@intel.com> | 2008-01-30 07:33:44 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:33:44 -0500 |
commit | 4716e79c9946044a53a65418cfba04836f6a5c36 (patch) | |
tree | b29941081f48496a08110351a67de11ca8f6be47 /arch/x86/kernel/srat_32.c | |
parent | 0947b2f31ca1ea1211d3cde2dbd8fcec579ef395 (diff) |
x86: replace boot_ioremap() with enhanced bt_ioremap() - remove boot_ioremap()
This patch replaces boot_ioremap invokation with bt_ioremap and
removes the boot_ioremap implementation.
Signed-off-by: Huang Ying <ying.huang@intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/srat_32.c')
-rw-r--r-- | arch/x86/kernel/srat_32.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/x86/kernel/srat_32.c b/arch/x86/kernel/srat_32.c index 2a8713ec0f9a..24bfd4a9e62a 100644 --- a/arch/x86/kernel/srat_32.c +++ b/arch/x86/kernel/srat_32.c | |||
@@ -57,8 +57,6 @@ static struct node_memory_chunk_s node_memory_chunk[MAXCHUNKS]; | |||
57 | static int num_memory_chunks; /* total number of memory chunks */ | 57 | static int num_memory_chunks; /* total number of memory chunks */ |
58 | static u8 __initdata apicid_to_pxm[MAX_APICID]; | 58 | static u8 __initdata apicid_to_pxm[MAX_APICID]; |
59 | 59 | ||
60 | extern void * boot_ioremap(unsigned long, unsigned long); | ||
61 | |||
62 | /* Identify CPU proximity domains */ | 60 | /* Identify CPU proximity domains */ |
63 | static void __init parse_cpu_affinity_structure(char *p) | 61 | static void __init parse_cpu_affinity_structure(char *p) |
64 | { | 62 | { |
@@ -299,7 +297,7 @@ int __init get_memcfg_from_srat(void) | |||
299 | } | 297 | } |
300 | 298 | ||
301 | rsdt = (struct acpi_table_rsdt *) | 299 | rsdt = (struct acpi_table_rsdt *) |
302 | boot_ioremap(rsdp->rsdt_physical_address, sizeof(struct acpi_table_rsdt)); | 300 | bt_ioremap(rsdp->rsdt_physical_address, sizeof(struct acpi_table_rsdt)); |
303 | 301 | ||
304 | if (!rsdt) { | 302 | if (!rsdt) { |
305 | printk(KERN_WARNING | 303 | printk(KERN_WARNING |
@@ -339,11 +337,11 @@ int __init get_memcfg_from_srat(void) | |||
339 | for (i = 0; i < tables; i++) { | 337 | for (i = 0; i < tables; i++) { |
340 | /* Map in header, then map in full table length. */ | 338 | /* Map in header, then map in full table length. */ |
341 | header = (struct acpi_table_header *) | 339 | header = (struct acpi_table_header *) |
342 | boot_ioremap(saved_rsdt.table.table_offset_entry[i], sizeof(struct acpi_table_header)); | 340 | bt_ioremap(saved_rsdt.table.table_offset_entry[i], sizeof(struct acpi_table_header)); |
343 | if (!header) | 341 | if (!header) |
344 | break; | 342 | break; |
345 | header = (struct acpi_table_header *) | 343 | header = (struct acpi_table_header *) |
346 | boot_ioremap(saved_rsdt.table.table_offset_entry[i], header->length); | 344 | bt_ioremap(saved_rsdt.table.table_offset_entry[i], header->length); |
347 | if (!header) | 345 | if (!header) |
348 | break; | 346 | break; |
349 | 347 | ||