diff options
| -rw-r--r-- | arch/x86/include/asm/pgtable.h | 2 | ||||
| -rw-r--r-- | arch/x86/mm/pat.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index 1de2094d2e57..a34c785c5a63 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h | |||
| @@ -274,7 +274,7 @@ static inline int is_new_memtype_allowed(u64 paddr, unsigned long size, | |||
| 274 | /* | 274 | /* |
| 275 | * PAT type is always WB for untracked ranges, so no need to check. | 275 | * PAT type is always WB for untracked ranges, so no need to check. |
| 276 | */ | 276 | */ |
| 277 | if (x86_platform.is_untracked_pat_range(paddr, paddr + size - 1)) | 277 | if (x86_platform.is_untracked_pat_range(paddr, paddr + size)) |
| 278 | return 1; | 278 | return 1; |
| 279 | 279 | ||
| 280 | /* | 280 | /* |
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)) { |
