From: Jeff Dike <jdike@addtoit.com>
Date: Tue, 5 Feb 2008 06:30:47 +0000 (-0800)
Subject: UML - Fix build in 2.6.24-rc2-mm1
X-Git-Tag: v2.6.25-rc1~848
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=300ecf59c0ca2c09fb7fde7dff986a7306e95361;p=linux-2.6-omap-h63xx.git

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: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/include/asm-um/pgtable.h b/include/asm-um/pgtable.h
index cb0d2048eca..1e7fc008559 100644
--- a/include/asm-um/pgtable.h
+++ b/include/asm-um/pgtable.h
@@ -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))
 
 /*