diff options
| author | Huang, Ying | 2008-01-30 13:33:44 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2008-01-30 13:33:44 +0100 |
| commit | beacfaac3f23b30814aafee37a055257c7062ef3 (patch) | |
| tree | 9a9a25cafa5fa4b79026caa8b0b442dc54b78889 /arch/x86/kernel/setup_32.c | |
| parent | x86: replace boot_ioremap() with enhanced bt_ioremap() - remove boot_ioremap() (diff) | |
| download | kernel-qcow2-linux-beacfaac3f23b30814aafee37a055257c7062ef3.tar.gz kernel-qcow2-linux-beacfaac3f23b30814aafee37a055257c7062ef3.tar.xz kernel-qcow2-linux-beacfaac3f23b30814aafee37a055257c7062ef3.zip | |
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/setup_32.c')
| -rw-r--r-- | arch/x86/kernel/setup_32.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c index 35db426de300..c038b09b1723 100644 --- a/arch/x86/kernel/setup_32.c +++ b/arch/x86/kernel/setup_32.c @@ -577,9 +577,9 @@ static void __init relocate_initrd(void) if (clen > MAX_MAP_CHUNK-slop) clen = MAX_MAP_CHUNK-slop; mapaddr = ramdisk_image & PAGE_MASK; - p = bt_ioremap(mapaddr, clen+slop); + p = early_ioremap(mapaddr, clen+slop); memcpy(q, p+slop, clen); - bt_iounmap(p, clen+slop); + early_iounmap(p, clen+slop); q += clen; ramdisk_image += clen; ramdisk_size -= clen; @@ -697,7 +697,7 @@ void __init setup_arch(char **cmdline_p) memcpy(&boot_cpu_data, &new_cpu_data, sizeof(new_cpu_data)); pre_setup_arch_hook(); early_cpu_init(); - bt_ioremap_init(); + early_ioremap_init(); #ifdef CONFIG_EFI if (!strncmp((char *)&boot_params.efi_info.efi_loader_signature, |