Commit 300ecf59 authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds
Browse files

UML - Fix build in 2.6.24-rc2-mm1 



The earlier pgtable.h tidying patch made things a bit too tidy.  Add
back a header which is needed in VMALLOC_START and friend.  Also add
back a definition of pmd_page_vaddr, which is needed on x86_64.

Signed-off-by: default avatarJeff Dike <jdike@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d83ecf08

include/asm-um/pgtable.h

+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#define __UM_PGTABLE_H



#include "linux/sched.h"

#include <asm/fixmap.h>



#define _PAGE_PRESENT	0x001

#define _PAGE_NEWPAGE	0x002
@@ -308,6 +309,7 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) 
 * this macro returns the index of the entry in the pmd page which would

 * control the given virtual address

 */

#define pmd_page_vaddr(pmd) ((unsigned long) __va(pmd_val(pmd) & PAGE_MASK))

#define pmd_index(address) (((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1))



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE