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

Commit 5f5192b9 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ingo Molnar
Browse files

x86: move page_is_ram() function 



Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent e1271f68

arch/x86/mm/init_32.c

+0 −22
Original line number Diff line number Diff line
@@ -211,28 +211,6 @@ static inline int page_kills_ppro(unsigned long pagenr) 
	return 0;

}



int page_is_ram(unsigned long pagenr)

{

	int i;

	unsigned long addr, end;



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



		if (e820.map[i].type != E820_RAM)	/* not usable memory */

			continue;

		/*

		 *	!!!FIXME!!! Some BIOSen report areas as RAM that

		 *	are not. Notably the 640->1Mb area. We need a sanity

		 *	check here.

		 */

		addr = (e820.map[i].addr+PAGE_SIZE-1) >> PAGE_SHIFT;

		end = (e820.map[i].addr+e820.map[i].size) >> PAGE_SHIFT;

		if  ((pagenr >= addr) && (pagenr < end))

			return 1;

	}

	return 0;

}



#ifdef CONFIG_HIGHMEM

pte_t *kmap_pte;

pgprot_t kmap_prot;

arch/x86/mm/ioremap.c

+24 −0
Original line number Diff line number Diff line
@@ -31,6 +31,30 @@ EXPORT_SYMBOL(__phys_addr); 


#endif



int page_is_ram(unsigned long pagenr)

{

	unsigned long addr, end;

	int i;



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

		/*

		 * Not usable memory:

		 */

		if (e820.map[i].type != E820_RAM)

			continue;

		/*

		 *	!!!FIXME!!! Some BIOSen report areas as RAM that

		 *	are not. Notably the 640->1Mb area. We need a sanity

		 *	check here.

		 */

		addr = (e820.map[i].addr + PAGE_SIZE-1) >> PAGE_SHIFT;

		end = (e820.map[i].addr + e820.map[i].size) >> PAGE_SHIFT;

		if ((pagenr >= addr) && (pagenr < end))

			return 1;

	}

	return 0;

}



/*

 * Fix up the linear direct mapping of the kernel to avoid cache attribute

 * conflicts.

include/asm-x86/page.h

+3 −0
Original line number Diff line number Diff line
@@ -47,6 +47,9 @@ 




#ifndef __ASSEMBLY__



extern int page_is_ram(unsigned long pagenr);



struct page;



static void inline clear_user_page(void *page, unsigned long vaddr,

include/asm-x86/page_32.h

+0 −1
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ extern int nx_enabled; 
 */

extern unsigned int __VMALLOC_RESERVE;

extern int sysctl_legacy_va_layout;

extern int page_is_ram(unsigned long pagenr);



#define VMALLOC_RESERVE		((unsigned long)__VMALLOC_RESERVE)

#define MAXMEM			(-__PAGE_OFFSET-__VMALLOC_RESERVE)