From 2880cb4223c0a216441fddf32620e85f23b21375 Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Sun, 22 Mar 2009 14:48:44 -0700
Subject: [PATCH] --- yaml --- r: 138819 b: refs/heads/master c:
 c8608d6b58981a58ca4aee8308576666c5f7ab0c h: refs/heads/master i:   138817:
 4d13fdd928f75f695d2d9c77a5404cb415dc6ef2   138815:
 bb9b7ff1d39f7d8a063a9f1a7d06ffa2d7bc26dd v: v3

---
 [refs]                           | 2 +-
 trunk/arch/x86/include/asm/dmi.h | 5 ++++-
 trunk/arch/x86/pci/i386.c        | 3 ---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 60d0e8c36f15..0755ae77ca88 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9cdec049389ce2c324fd1ec508a71528a27d4a07
+refs/heads/master: c8608d6b58981a58ca4aee8308576666c5f7ab0c
diff --git a/trunk/arch/x86/include/asm/dmi.h b/trunk/arch/x86/include/asm/dmi.h
index aa32f7e6c197..fd8f9e2ca35f 100644
--- a/trunk/arch/x86/include/asm/dmi.h
+++ b/trunk/arch/x86/include/asm/dmi.h
@@ -1,10 +1,13 @@
 #ifndef _ASM_X86_DMI_H
 #define _ASM_X86_DMI_H
 
+#include <linux/compiler.h>
+#include <linux/init.h>
+
 #include <asm/io.h>
 #include <asm/setup.h>
 
-static inline void *dmi_alloc(unsigned len)
+static __always_inline __init void *dmi_alloc(unsigned len)
 {
 	return extend_brk(len, sizeof(int));
 }
diff --git a/trunk/arch/x86/pci/i386.c b/trunk/arch/x86/pci/i386.c
index f234a37bd428..5ead808dd70c 100644
--- a/trunk/arch/x86/pci/i386.c
+++ b/trunk/arch/x86/pci/i386.c
@@ -319,9 +319,6 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
 			return -EINVAL;
 		}
 		flags = new_flags;
-		vma->vm_page_prot = __pgprot(
-			(pgprot_val(vma->vm_page_prot) & ~_PAGE_CACHE_MASK) |
-			flags);
 	}
 
 	if (((vma->vm_pgoff < max_low_pfn_mapped) ||