---

yaml --- r: 138819 b: refs/heads/master c: c8608d6 h: refs/heads/master i: 138817: 4d13fdd 138815: bb9b7ff v: v3
git-mirror · Mar 23, 2009 · 2880cb4 · 2880cb4
1 parent d094e01
commit 2880cb4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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) ||