Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit beacfaac authored by Huang, Ying's avatar Huang, Ying Committed by Ingo Molnar
Browse files

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: default avatarHuang Ying <ying.huang@intel.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 4716e79c

arch/x86/kernel/efi.c

+12 −12
Original line number Diff line number Diff line
@@ -256,12 +256,12 @@ void __init efi_init(void) 
	memmap.desc_version = boot_params.efi_info.efi_memdesc_version;

	memmap.desc_size = boot_params.efi_info.efi_memdesc_size;



	efi.systab = efi_early_ioremap((unsigned long)efi_phys.systab,

	efi.systab = early_ioremap((unsigned long)efi_phys.systab,

				   sizeof(efi_system_table_t));

	if (efi.systab == NULL)

		printk(KERN_ERR "Couldn't map the EFI system table!\n");

	memcpy(&efi_systab, efi.systab, sizeof(efi_system_table_t));

	efi_early_iounmap(efi.systab, sizeof(efi_system_table_t));

	early_iounmap(efi.systab, sizeof(efi_system_table_t));

	efi.systab = &efi_systab;



	/*
@@ -278,14 +278,14 @@ void __init efi_init(void) 
	/*

	 * Show what we know for posterity

	 */

	c16 = tmp = efi_early_ioremap(efi.systab->fw_vendor, 2);

	c16 = tmp = early_ioremap(efi.systab->fw_vendor, 2);

	if (c16) {

		for (i = 0; i < sizeof(vendor) && *c16; ++i)

			vendor[i] = *c16++;

		vendor[i] = '\0';

	} else

		printk(KERN_ERR PFX "Could not map the firmware vendor!\n");

	efi_early_iounmap(tmp, 2);

	early_iounmap(tmp, 2);



	printk(KERN_INFO "EFI v%u.%.02u by %s \n",

	       efi.systab->hdr.revision >> 16,
@@ -294,7 +294,7 @@ void __init efi_init(void) 
	/*

	 * Let's see what config tables the firmware passed to us.

	 */

	config_tables = efi_early_ioremap(

	config_tables = early_ioremap(

		efi.systab->tables,

		efi.systab->nr_tables * sizeof(efi_config_table_t));

	if (config_tables == NULL)
@@ -328,7 +328,7 @@ void __init efi_init(void) 
		}

	}

	printk("\n");

	efi_early_iounmap(config_tables,

	early_iounmap(config_tables,

			  efi.systab->nr_tables * sizeof(efi_config_table_t));



	/*
@@ -337,7 +337,7 @@ void __init efi_init(void) 
	 * address of several of the EFI runtime functions, needed to

	 * set the firmware into virtual mode.

	 */

	runtime = efi_early_ioremap((unsigned long)efi.systab->runtime,

	runtime = early_ioremap((unsigned long)efi.systab->runtime,

				sizeof(efi_runtime_services_t));

	if (runtime != NULL) {

		/*
@@ -357,10 +357,10 @@ void __init efi_init(void) 
	} else

		printk(KERN_ERR "Could not map the EFI runtime service "

		       "table!\n");

	efi_early_iounmap(runtime, sizeof(efi_runtime_services_t));

	early_iounmap(runtime, sizeof(efi_runtime_services_t));



	/* Map the EFI memory map */

	memmap.map = efi_early_ioremap((unsigned long)memmap.phys_map,

	memmap.map = early_ioremap((unsigned long)memmap.phys_map,

				   memmap.nr_map * memmap.desc_size);

	if (memmap.map == NULL)

		printk(KERN_ERR "Could not map the EFI memory map!\n");

arch/x86/kernel/efi_32.c

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ void __init efi_map_memmap(void) 
{

	memmap.map = NULL;



	memmap.map = bt_ioremap((unsigned long) memmap.phys_map,

	memmap.map = early_ioremap((unsigned long) memmap.phys_map,

			(memmap.nr_map * memmap.desc_size));

	if (memmap.map == NULL)

		printk(KERN_ERR "Could not remap the EFI memmap!\n");

arch/x86/kernel/setup_32.c

+3 −3
Original line number Diff line number Diff line
@@ -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,

arch/x86/kernel/srat_32.c

+3 −3
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ int __init get_memcfg_from_srat(void) 
	}



	rsdt = (struct acpi_table_rsdt *)

	    bt_ioremap(rsdp->rsdt_physical_address, sizeof(struct acpi_table_rsdt));

	    early_ioremap(rsdp->rsdt_physical_address, sizeof(struct acpi_table_rsdt));



	if (!rsdt) {

		printk(KERN_WARNING
@@ -337,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 *)

			bt_ioremap(saved_rsdt.table.table_offset_entry[i], sizeof(struct acpi_table_header));

			early_ioremap(saved_rsdt.table.table_offset_entry[i], sizeof(struct acpi_table_header));

		if (!header)

			break;

		header = (struct acpi_table_header *)

			bt_ioremap(saved_rsdt.table.table_offset_entry[i], header->length);

			early_ioremap(saved_rsdt.table.table_offset_entry[i], header->length);

		if (!header)

			break;

arch/x86/mm/init_32.c

+2 −2
Original line number Diff line number Diff line
@@ -429,11 +429,11 @@ static void __init pagetable_init (void) 
	 * Fixed mappings, only the page table structure has to be

	 * created - mappings will be set by set_fixmap():

	 */

	bt_ioremap_clear();

	early_ioremap_clear();

	vaddr = __fix_to_virt(__end_of_fixed_addresses - 1) & PMD_MASK;

	end = (FIXADDR_TOP + PMD_SIZE - 1) & PMD_MASK;

	page_table_range_init(vaddr, end, pgd_base);

	bt_ioremap_reset();

	early_ioremap_reset();



	permanent_kmaps_init(pgd_base);