From 952819fac90ea09cff5640ef5f1fc81d560fe992 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Mon, 12 May 2008 15:43:35 +0200
Subject: [PATCH] --- yaml --- r: 99358 b: refs/heads/master c:
 635ee418381566f03819408e1303ef21fcf2d41c h: refs/heads/master v: v3

---
 [refs]                       |  2 +-
 trunk/include/asm-x86/page.h | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 067f68d7752c..98fcbb7792db 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 535694f361419ca195fd915dd5038c926334e1be
+refs/heads/master: 635ee418381566f03819408e1303ef21fcf2d41c
diff --git a/trunk/include/asm-x86/page.h b/trunk/include/asm-x86/page.h
index dc936dddf161..ed165097520f 100644
--- a/trunk/include/asm-x86/page.h
+++ b/trunk/include/asm-x86/page.h
@@ -51,8 +51,15 @@
 
 #ifndef __ASSEMBLY__
 
+typedef struct { pgdval_t pgd; } pgd_t;
+typedef struct { pgprotval_t pgprot; } pgprot_t;
+
 extern int page_is_ram(unsigned long pagenr);
 extern int devmem_is_allowed(unsigned long pagenr);
+extern void map_devmem(unsigned long pfn, unsigned long size,
+		       pgprot_t vma_prot);
+extern void unmap_devmem(unsigned long pfn, unsigned long size,
+			 pgprot_t vma_prot);
 
 extern unsigned long max_pfn_mapped;
 
@@ -74,9 +81,6 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
 	alloc_page_vma(GFP_HIGHUSER | __GFP_ZERO | movableflags, vma, vaddr)
 #define __HAVE_ARCH_ALLOC_ZEROED_USER_HIGHPAGE
 
-typedef struct { pgdval_t pgd; } pgd_t;
-typedef struct { pgprotval_t pgprot; } pgprot_t;
-
 static inline pgd_t native_make_pgd(pgdval_t val)
 {
 	return (pgd_t) { val };