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

Commit eee5a9fa authored by Arjan van de Ven's avatar Arjan van de Ven Committed by Linus Torvalds
Browse files

[PATCH] x86_64: Rename e820_mapped to e820_any_mapped 



Rename e820_mapped to e820_any_mapped since it tests if any part of the
range is mapped according to the type.

Later steps will introduce e820_all_mapped which will check if the
entire range is mapped with the type.  Both have their merit.

Signed-off-by: default avatarArjan van de Ven <arjan@linux.intel.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a8062231

arch/x86_64/kernel/aperture.c

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static int __init aperture_valid(char *name, u64 aper_base, u32 aper_size) 
		printk("Aperture from %s beyond 4GB. Ignoring.\n",name);

		return 0; 

	}

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

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

		printk("Aperture from %s pointing to e820 RAM. Ignoring.\n",name);

		return 0; 

	}

arch/x86_64/kernel/e820.c

+2 −1
Original line number Diff line number Diff line
@@ -80,7 +80,8 @@ static inline int bad_addr(unsigned long *addrp, unsigned long size) 
	return 0;

} 



int __meminit e820_mapped(unsigned long start, unsigned long end, unsigned type)

int __meminit

e820_any_mapped(unsigned long start, unsigned long end, unsigned type)

{ 

	int i;

	for (i = 0; i < e820.nr_map; i++) {

arch/x86_64/mm/init.c

+1 −1
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ static void __meminit phys_pud_init(pud_t *pud, unsigned long address, unsigned 
		if (paddr >= end)

			break;



		if (!after_bootmem && !e820_mapped(paddr, paddr+PUD_SIZE, 0)) {

		if (!after_bootmem && !e820_any_mapped(paddr, paddr+PUD_SIZE, 0)) {

			set_pud(pud, __pud(0)); 

			continue;

		}

include/asm-x86_64/e820.h

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ extern void contig_e820_setup(void); 
extern unsigned long e820_end_of_ram(void);

extern void e820_reserve_resources(void);

extern void e820_print_map(char *who);

extern int e820_mapped(unsigned long start, unsigned long end, unsigned type);

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



extern void e820_bootmem_free(pg_data_t *pgdat, unsigned long start,unsigned long end);

extern void e820_setup_gap(void);