aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/mm/pat.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
index e78cd0ec2bcf..81fb75344cd3 100644
--- a/arch/x86/mm/pat.c
+++ b/arch/x86/mm/pat.c
@@ -355,9 +355,6 @@ static int free_ram_pages_type(u64 start, u64 end)
355 * - _PAGE_CACHE_UC_MINUS 355 * - _PAGE_CACHE_UC_MINUS
356 * - _PAGE_CACHE_UC 356 * - _PAGE_CACHE_UC
357 * 357 *
358 * req_type will have a special case value '-1', when requester want to inherit
359 * the memory type from mtrr (if WB), existing PAT, defaulting to UC_MINUS.
360 *
361 * If new_type is NULL, function will return an error if it cannot reserve the 358 * If new_type is NULL, function will return an error if it cannot reserve the
362 * region with req_type. If new_type is non-NULL, function will return 359 * region with req_type. If new_type is non-NULL, function will return
363 * available type in new_type in case of no error. In case of any error 360 * available type in new_type in case of no error. In case of any error
@@ -377,9 +374,7 @@ int reserve_memtype(u64 start, u64 end, unsigned long req_type,
377 if (!pat_enabled) { 374 if (!pat_enabled) {
378 /* This is identical to page table setting without PAT */ 375 /* This is identical to page table setting without PAT */
379 if (new_type) { 376 if (new_type) {
380 if (req_type == -1) 377 if (req_type == _PAGE_CACHE_WC)
381 *new_type = _PAGE_CACHE_WB;
382 else if (req_type == _PAGE_CACHE_WC)
383 *new_type = _PAGE_CACHE_UC_MINUS; 378 *new_type = _PAGE_CACHE_UC_MINUS;
384 else 379 else
385 *new_type = req_type & _PAGE_CACHE_MASK; 380 *new_type = req_type & _PAGE_CACHE_MASK;