diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-11-24 00:12:07 +0100 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-11-24 02:09:59 +0100 |
| commit | 55a6ca25472ee01574bfc24d23b7f5fa09cc38cf (patch) | |
| tree | 8d63f57f636981c6029a45ea10a04a65e407e3d8 /arch/x86/include/asm | |
| parent | x86: UV SGI: Don't track GRU space in PAT (diff) | |
| download | linux-55a6ca25472ee01574bfc24d23b7f5fa09cc38cf.tar.xz linux-55a6ca25472ee01574bfc24d23b7f5fa09cc38cf.zip | |
x86, mm: Call is_untracked_pat_range() rather than is_ISA_range()
Checkin fd12a0d69aee6d90fa9b9890db24368a897f8423 made the PAT
untracked range a platform configurable, but missed on occurrence of
is_ISA_range() which still refers to PAT-untracked memory, and
therefore should be using the configurable.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Cc: Jack Steiner <steiner@sgi.com>
Cc: Suresh Siddha <suresh.b.siddha@intel.com>
LKML-Reference: <20091119202341.GA4420@sgi.com>
Diffstat (limited to 'arch/x86/include/asm')
| -rw-r--r-- | arch/x86/include/asm/pgtable.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index af6fd360ab35..1de2094d2e57 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -16,6 +16,8 @@ #ifndef __ASSEMBLY__ +#include <asm/x86_init.h> + /* * ZERO_PAGE is a global shared page that is always zero: used * for zero-mapped memory areas etc.. @@ -270,9 +272,9 @@ static inline int is_new_memtype_allowed(u64 paddr, unsigned long size, unsigned long new_flags) { /* - * PAT type is always WB for ISA. So no need to check. + * PAT type is always WB for untracked ranges, so no need to check. */ - if (is_ISA_range(paddr, paddr + size - 1)) + if (x86_platform.is_untracked_pat_range(paddr, paddr + size - 1)) return 1; /* |