git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/oss' into for-linus
[pandora-kernel.git]
/
arch
/
x86
/
include
/
asm
/
pgtable.h
diff --git
a/arch/x86/include/asm/pgtable.h
b/arch/x86/include/asm/pgtable.h
index
3cc06e3
..
1674807
100644
(file)
--- a/
arch/x86/include/asm/pgtable.h
+++ b/
arch/x86/include/asm/pgtable.h
@@
-2,6
+2,7
@@
#define _ASM_X86_PGTABLE_H
#include <asm/page.h>
#define _ASM_X86_PGTABLE_H
#include <asm/page.h>
+#include <asm/e820.h>
#include <asm/pgtable_types.h>
#include <asm/pgtable_types.h>
@@
-269,9
+270,16
@@
static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)
#define canon_pgprot(p) __pgprot(massage_pgprot(p))
#define canon_pgprot(p) __pgprot(massage_pgprot(p))
-static inline int is_new_memtype_allowed(unsigned long flags,
- unsigned long new_flags)
+static inline int is_new_memtype_allowed(u64 paddr, unsigned long size,
+ unsigned long flags,
+ unsigned long new_flags)
{
{
+ /*
+ * PAT type is always WB for ISA. So no need to check.
+ */
+ if (is_ISA_range(paddr, paddr + size - 1))
+ return 1;
+
/*
* Certain new memtypes are not allowed with certain
* requested memtype:
/*
* Certain new memtypes are not allowed with certain
* requested memtype: