aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/mm/pat.c
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-11-23 17:49:20 -0500
committerH. Peter Anvin <hpa@zytor.com>2009-11-23 20:09:59 -0500
commit8a27138924f64d2f30c1022f909f74480046bc3f (patch)
tree72d7d40e1cba07b08fea49a064c6388a6d2bd780 /arch/x86/mm/pat.c
parent55a6ca25472ee01574bfc24d23b7f5fa09cc38cf (diff)
x86, mm: is_untracked_pat_range() takes a normal semiclosed range
is_untracked_pat_range() -- like its components, is_ISA_range() and is_GRU_range(), takes a normal semiclosed interval (>=, <) whereas the PAT code called it as if it took a closed range (>=, <=). Fix. Although this is a bug, I believe it is non-manifest, simply because none of the callers will call this with non-page-aligned addresses. Signed-off-by: H. Peter Anvin <hpa@zytor.com> Acked-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Suresh Siddha <suresh.b.siddha@intel.com> LKML-Reference: <20091119202341.GA4420@sgi.com>
Diffstat (limited to 'arch/x86/mm/pat.c')
-rw-r--r--arch/x86/mm/pat.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
index 38a66ef9426d..b5bc08cfcea6 100644
--- a/arch/x86/mm/pat.c
+++ b/arch/x86/mm/pat.c
@@ -394,7 +394,7 @@ int reserve_memtype(u64 start, u64 end, unsigned long req_type,
394 } 394 }
395 395
396 /* Low ISA region is always mapped WB in page table. No need to track */ 396 /* Low ISA region is always mapped WB in page table. No need to track */
397 if (x86_platform.is_untracked_pat_range(start, end - 1)) { 397 if (x86_platform.is_untracked_pat_range(start, end)) {
398 if (new_type) 398 if (new_type)
399 *new_type = _PAGE_CACHE_WB; 399 *new_type = _PAGE_CACHE_WB;
400 return 0; 400 return 0;
@@ -505,7 +505,7 @@ int free_memtype(u64 start, u64 end)
505 return 0; 505 return 0;
506 506
507 /* Low ISA region is always mapped WB. No need to track */ 507 /* Low ISA region is always mapped WB. No need to track */
508 if (x86_platform.is_untracked_pat_range(start, end - 1)) 508 if (x86_platform.is_untracked_pat_range(start, end))
509 return 0; 509 return 0;
510 510
511 is_range_ram = pat_pagerange_is_ram(start, end); 511 is_range_ram = pat_pagerange_is_ram(start, end);
@@ -588,7 +588,7 @@ static unsigned long lookup_memtype(u64 paddr)
588 int rettype = _PAGE_CACHE_WB; 588 int rettype = _PAGE_CACHE_WB;
589 struct memtype *entry; 589 struct memtype *entry;
590 590
591 if (x86_platform.is_untracked_pat_range(paddr, paddr + PAGE_SIZE - 1)) 591 if (x86_platform.is_untracked_pat_range(paddr, paddr + PAGE_SIZE))
592 return rettype; 592 return rettype;
593 593
594 if (pat_pagerange_is_ram(paddr, paddr + PAGE_SIZE)) { 594 if (pat_pagerange_is_ram(paddr, paddr + PAGE_SIZE)) {