Commit cc290ca3 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge
Browse files

x86: unify pages_to_mb 



Impact: cleanup

Unify and demacro pages_to_mb.

Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
parent 99510238

arch/x86/include/asm/pgtable.h

+5 −0
Original line number Diff line number Diff line
@@ -519,6 +519,11 @@ static inline int pmd_bad(pmd_t pmd) 
	return (pmd_val(pmd) & ~(PTE_PFN_MASK | _PAGE_USER)) != _KERNPG_TABLE;

}



static inline unsigned long pages_to_mb(unsigned long npg)

{

	return npg >> (20 - PAGE_SHIFT);

}



#if PAGETABLE_LEVELS > 2

static inline int pud_present(pud_t pud)

{

arch/x86/include/asm/pgtable_32.h

+0 −2
Original line number Diff line number Diff line
@@ -85,8 +85,6 @@ extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t); 
/* The boot page tables (all created as a single array) */

extern unsigned long pg0[];



#define pages_to_mb(x) ((x) >> (20-PAGE_SHIFT))



#ifdef CONFIG_X86_PAE

# include <asm/pgtable-3level.h>

#else

arch/x86/include/asm/pgtable_64.h

+0 −2
Original line number Diff line number Diff line
@@ -154,8 +154,6 @@ static inline void native_pgd_clear(pgd_t *pgd) 


#ifndef __ASSEMBLY__



#define pages_to_mb(x)	((x) >> (20 - PAGE_SHIFT))   /* FIXME: is this right? */



/*

 * Conversion functions: convert a page and protection to a page entry,

 * and a page entry and page directory to the page they refer to.