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

Commit 3bce64f0 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86/boot/e820: Rename e820_any_mapped()/e820_all_mapped() to e820__mapped_any()/e820__mapped_all() 



The 'any' and 'all' are modified to the 'mapped' concept, so move them last in the name.

No change in functionality.

Cc: Alex Thorlton <athorlton@sgi.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Huang, Ying <ying.huang@intel.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul Jackson <pj@sgi.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Tejun Heo <tj@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Wei Yang <richard.weiyang@gmail.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent f52355a9

arch/x86/include/asm/e820/api.h

+2 −2
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ extern struct e820_table *e820_table_firmware; 


extern unsigned long pci_mem_start;



extern int  e820_any_mapped(u64 start, u64 end, unsigned type);

extern int  e820_all_mapped(u64 start, u64 end, unsigned type);

extern int  e820__mapped_any(u64 start, u64 end, unsigned type);

extern int  e820__mapped_all(u64 start, u64 end, unsigned type);

extern void e820_add_region(u64 start, u64 size, int type);

extern void e820_print_map(char *who);

extern int  e820__update_table(struct e820_entry *biosmap, int max_nr_map, u32 *pnr_map);

arch/x86/include/asm/gart.h

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static inline int aperture_valid(u64 aper_base, u32 aper_size, u32 min_size) 
		printk(KERN_INFO "Aperture beyond 4GB. Ignoring.\n");

		return 0;

	}

	if (e820_any_mapped(aper_base, aper_base + aper_size, E820_RAM)) {

	if (e820__mapped_any(aper_base, aper_base + aper_size, E820_RAM)) {

		printk(KERN_INFO "Aperture pointing to e820 RAM. Ignoring.\n");

		return 0;

	}

arch/x86/kernel/aperture_64.c

+1 −1
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ void __init early_gart_iommu_check(void) 
		fix = 1;



	if (gart_fix_e820 && !fix && aper_enabled) {

		if (e820_any_mapped(aper_base, aper_base + aper_size,

		if (e820__mapped_any(aper_base, aper_base + aper_size,

				    E820_RAM)) {

			/* reserve it, so we can reuse it in second kernel */

			pr_info("e820: reserve [mem %#010Lx-%#010Lx] for GART\n",

arch/x86/kernel/e820.c

+3 −3
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ EXPORT_SYMBOL(pci_mem_start); 
 * This function checks if any part of the range <start,end> is mapped

 * with type.

 */

int e820_any_mapped(u64 start, u64 end, unsigned type)

int e820__mapped_any(u64 start, u64 end, unsigned type)

{

	int i;
@@ -83,7 +83,7 @@ int e820_any_mapped(u64 start, u64 end, unsigned type) 
	}

	return 0;

}

EXPORT_SYMBOL_GPL(e820_any_mapped);

EXPORT_SYMBOL_GPL(e820__mapped_any);



/*

 * This function checks if the entire <start,end> range is mapped with 'type'.
@@ -91,7 +91,7 @@ EXPORT_SYMBOL_GPL(e820_any_mapped); 
 * Note: this function only works correctly once the E820 table is sorted and

 * not-overlapping (at least for the range specified), which is the case normally.

 */

int __init e820_all_mapped(u64 start, u64 end, unsigned type)

int __init e820__mapped_all(u64 start, u64 end, unsigned type)

{

	int i;

arch/x86/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -756,7 +756,7 @@ static void __init e820_add_kernel_range(void) 
	 * exclude kernel range. If we really are running on top non-RAM,

	 * we will crash later anyways.

	 */

	if (e820_all_mapped(start, start + size, E820_RAM))

	if (e820__mapped_all(start, start + size, E820_RAM))

		return;



	pr_warn(".text .data .bss are not marked as E820_RAM!\n");