[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-55a6ca25472ee01574bfc24d23b7f5fa09cc38cf@git.kernel.org>
Date: Tue, 24 Nov 2009 01:12:46 GMT
From: "tip-bot for H. Peter Anvin" <hpa@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
steiner@....com, suresh.b.siddha@...el.com, tglx@...utronix.de
Subject: [tip:x86/mm] x86, mm: Call is_untracked_pat_range() rather than is_ISA_range()
Commit-ID: 55a6ca25472ee01574bfc24d23b7f5fa09cc38cf
Gitweb: http://git.kernel.org/tip/55a6ca25472ee01574bfc24d23b7f5fa09cc38cf
Author: H. Peter Anvin <hpa@...or.com>
AuthorDate: Mon, 23 Nov 2009 15:12:07 -0800
Committer: H. Peter Anvin <hpa@...or.com>
CommitDate: Mon, 23 Nov 2009 17:09:59 -0800
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@...or.com>
Cc: Jack Steiner <steiner@....com>
Cc: Suresh Siddha <suresh.b.siddha@...el.com>
LKML-Reference: <20091119202341.GA4420@....com>
---
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 af6fd36..1de2094 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;
/*
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists