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 | beacfaac3f23b30814aafee37a055257c7062ef3 (patch) | |
tree | 9a9a25cafa5fa4b79026caa8b0b442dc54b78889 /arch/x86/kernel/srat_32.c | |
parent | 4716e79c9946044a53a65418cfba04836f6a5c36 (diff) |
x86 32-bit boot: rename bt_ioremap() to early_ioremap()
This patch renames bt_ioremap to early_ioremap, which is used in
x86_64. This makes it easier to merge i386 and x86_64 usage.
[ mingo@elte.hu: fix ]
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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/srat_32.c b/arch/x86/kernel/srat_32.c index 24bfd4a9e62a..2bf6903cb444 100644 --- a/arch/x86/kernel/srat_32.c +++ b/arch/x86/kernel/srat_32.c | |||
@@ -297,7 +297,7 @@ int __init get_memcfg_from_srat(void) | |||
297 | } | 297 | } |
298 | 298 | ||
299 | rsdt = (struct acpi_table_rsdt *) | 299 | rsdt = (struct acpi_table_rsdt *) |
300 | bt_ioremap(rsdp->rsdt_physical_address, sizeof(struct acpi_table_rsdt)); | 300 | early_ioremap(rsdp->rsdt_physical_address, sizeof(struct acpi_table_rsdt)); |
301 | 301 | ||
302 | if (!rsdt) { | 302 | if (!rsdt) { |
303 | printk(KERN_WARNING | 303 | printk(KERN_WARNING |
@@ -337,11 +337,11 @@ int __init get_memcfg_from_srat(void) | |||
337 | for (i = 0; i < tables; i++) { | 337 | for (i = 0; i < tables; i++) { |
338 | /* Map in header, then map in full table length. */ | 338 | /* Map in header, then map in full table length. */ |
339 | header = (struct acpi_table_header *) | 339 | header = (struct acpi_table_header *) |
340 | bt_ioremap(saved_rsdt.table.table_offset_entry[i], sizeof(struct acpi_table_header)); | 340 | early_ioremap(saved_rsdt.table.table_offset_entry[i], sizeof(struct acpi_table_header)); |
341 | if (!header) | 341 | if (!header) |
342 | break; | 342 | break; |
343 | header = (struct acpi_table_header *) | 343 | header = (struct acpi_table_header *) |
344 | bt_ioremap(saved_rsdt.table.table_offset_entry[i], header->length); | 344 | early_ioremap(saved_rsdt.table.table_offset_entry[i], header->length); |
345 | if (!header) | 345 | if (!header) |
346 | break; | 346 | break; |
347 | 347 | ||