i386 boot: replace boot_ioremap with enhanced bt_ioremap - remove boot_ioremap
PATCH 2/3 i386 boot: 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 <[email protected]>
--- arch/x86/Kconfig | 4 - arch/x86/kernel/srat_32.c | 8 +-- arch/x86/mm/Makefile_32 | 1 arch/x86/mm/boot_ioremap_32.c | 100 ------------------------------------------ include/asm-x86/efi.h | 8 --- 5 files changed, 5 insertions(+), 116 deletions(-)
arch/x86/kernel/srat_32.c +3 -5
@@ -57,8 +57,6 @@ static struct node_memory_chunk_s node_mstatic int num_memory_chunks;/* total number of memory chunks */ static u8 __initdata apicid_to_pxm[MAX_APICID ]; -extern void *boot_ioremap (unsigned long ,unsigned long ); -/* Identify CPU proximity domains */ static void __init parse_cpu_affinity_structure (char *p) {
@@ -299,7 +297,7 @@ int __init get_memcfg_from_srat(void) } rsdt = (struct acpi_table_rsdt *) -boot_ioremap (rsdp->rsdt_physical_address,sizeof (struct acpi_table_rsdt )); +bt_ioremap (rsdp->rsdt_physical_address,sizeof (struct acpi_table_rsdt ));if (!rsdt) { printk(KERN_WARNING
@@ -339,11 +337,11 @@ int __init get_memcfg_from_srat(void)for (i =0 ; i < tables; i++) {/* Map in header, then map in full table length. */ header = (struct acpi_table_header *) -boot_ioremap (saved_rsdt.table.table_offset_entry[i],sizeof (struct acpi_table_header )); +bt_ioremap (saved_rsdt.table.table_offset_entry[i],sizeof (struct acpi_table_header ));if (!header)break ; header = (struct acpi_table_header *) -boot_ioremap (saved_rsdt.table.table_offset_entry[i], header->length); +bt_ioremap (saved_rsdt.table.table_offset_entry[i], header->length);if (!header)break ;
arch/x86/mm/boot_ioremap_32.c deleted +0 -100
100 lines not on this page · raw message
arch/x86/Kconfig +0 -4
@@ -1022,10 +1022,6 @@ config IRQBALANCE The default yes will allow the kernel to do irq load balancing. Saying no will keep the kernel from doing irq load balancing. -config BOOT_IOREMAP - def_bool y - depends on X86_32 - config SECCOMP def_bool y prompt "Enable seccomp to safely compute untrusted bytecode"
arch/x86/mm/Makefile_32 +0 -1
@@ -7,4 +7,3 @@ obj-y := init_32.o pgtable_32.o fault_32 obj-$(CONFIG_NUMA) += discontig_32.o obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o obj-$(CONFIG_HIGHMEM) += highmem_32.o -obj-$(CONFIG_BOOT_IOREMAP) += boot_ioremap_32.o
include/asm-x86/efi.h +2 -6
@@ -32,13 +32,9 @@ extern unsigned long asmlinkage efi_call efi_call_virt(f, a1, a2, a3, a4, a5)#define efi_call_virt6 (f, a1, a2, a3, a4, a5, a6) \ efi_call_virt(f, a1, a2, a3, a4, a5, a6) -/* -* We require an early boot_ioremap mapping mechanism initially -*/ -extern void *boot_ioremap (unsigned long ,unsigned long ); -#define efi_early_ioremap (addr, size) boot_ioremap(addr, size) -#define efi_early_iounmap (vaddr, size) +#define efi_early_ioremap (addr, size) bt_ioremap(addr, size) +#define efi_early_iounmap (vaddr, size) bt_iounmap(vaddr, size)#define efi_ioremap (addr, size) ioremap(addr, size)