From a16c2603c4e30b55ebf4101481216f0391c81426 Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Mon, 23 Nov 2009 15:12:07 -0800 Subject: [PATCH] --- yaml --- r: 173059 b: refs/heads/master c: 55a6ca25472ee01574bfc24d23b7f5fa09cc38cf h: refs/heads/master i: 173057: 6e7c226de2d56ad1e0ee155b36d55a8e3f061807 173055: eb9301b082fe444cdb28a86c418eb8af59bbae0e v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/pgtable.h | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3208b305dfd9..56b2dfd07b15 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fd12a0d69aee6d90fa9b9890db24368a897f8423 +refs/heads/master: 55a6ca25472ee01574bfc24d23b7f5fa09cc38cf diff --git a/trunk/arch/x86/include/asm/pgtable.h b/trunk/arch/x86/include/asm/pgtable.h index af6fd360ab35..1de2094d2e57 100644 --- a/trunk/arch/x86/include/asm/pgtable.h +++ b/trunk/arch/x86/include/asm/pgtable.h @@ -16,6 +16,8 @@ #ifndef __ASSEMBLY__ +#include + /* * 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; /*