From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755173AbbGUJj1 (ORCPT ); Tue, 21 Jul 2015 05:39:27 -0400 Received: from terminus.zytor.com ([198.137.202.10]:40403 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754073AbbGUJjW (ORCPT ); Tue, 21 Jul 2015 05:39:22 -0400 Date: Tue, 21 Jul 2015 02:38:37 -0700 From: tip-bot for Jan Beulich Message-ID: Cc: tglx@linutronix.de, jbeulich@suse.com, linux-kernel@vger.kernel.org, toshi.kani@hp.com, peterz@infradead.org, hpa@zytor.com, mingo@kernel.org, luto@amacapital.net, JBeulich@suse.com, bp@suse.de, torvalds@linux-foundation.org Reply-To: tglx@linutronix.de, linux-kernel@vger.kernel.org, jbeulich@suse.com, toshi.kani@hp.com, hpa@zytor.com, peterz@infradead.org, mingo@kernel.org, JBeulich@suse.com, bp@suse.de, luto@amacapital.net, torvalds@linux-foundation.org In-Reply-To: <55ACC3660200007800092E62@mail.emea.novell.com> References: <55ACC3660200007800092E62@mail.emea.novell.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/mm/pat: Adjust default caching mode translation tables Git-Commit-ID: ca1fec58bc6a90be96a59b4769e951156846c6ca X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: ca1fec58bc6a90be96a59b4769e951156846c6ca Gitweb: http://git.kernel.org/tip/ca1fec58bc6a90be96a59b4769e951156846c6ca Author: Jan Beulich AuthorDate: Mon, 20 Jul 2015 08:46:14 +0100 Committer: Ingo Molnar CommitDate: Tue, 21 Jul 2015 08:23:06 +0200 x86/mm/pat: Adjust default caching mode translation tables Make WT really mean WT (rather than UC). I can't see why commit 9cd25aac1f ("x86/mm/pat: Emulate PAT when it is disabled") didn't make this to match its changes to pat_init(). Signed-off-by: Jan Beulich Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Toshi Kani Link: http://lkml.kernel.org/r/55ACC3660200007800092E62@mail.emea.novell.com Signed-off-by: Ingo Molnar --- arch/x86/mm/init.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c index 8533b46..7a45322 100644 --- a/arch/x86/mm/init.c +++ b/arch/x86/mm/init.c @@ -43,18 +43,18 @@ uint16_t __cachemode2pte_tbl[_PAGE_CACHE_MODE_NUM] = { [_PAGE_CACHE_MODE_WC ] = 0 | _PAGE_PCD, [_PAGE_CACHE_MODE_UC_MINUS] = 0 | _PAGE_PCD, [_PAGE_CACHE_MODE_UC ] = _PAGE_PWT | _PAGE_PCD, - [_PAGE_CACHE_MODE_WT ] = 0 | _PAGE_PCD, + [_PAGE_CACHE_MODE_WT ] = _PAGE_PWT | 0, [_PAGE_CACHE_MODE_WP ] = 0 | _PAGE_PCD, }; EXPORT_SYMBOL(__cachemode2pte_tbl); uint8_t __pte2cachemode_tbl[8] = { [__pte2cm_idx( 0 | 0 | 0 )] = _PAGE_CACHE_MODE_WB, - [__pte2cm_idx(_PAGE_PWT | 0 | 0 )] = _PAGE_CACHE_MODE_UC_MINUS, + [__pte2cm_idx(_PAGE_PWT | 0 | 0 )] = _PAGE_CACHE_MODE_WT, [__pte2cm_idx( 0 | _PAGE_PCD | 0 )] = _PAGE_CACHE_MODE_UC_MINUS, [__pte2cm_idx(_PAGE_PWT | _PAGE_PCD | 0 )] = _PAGE_CACHE_MODE_UC, [__pte2cm_idx( 0 | 0 | _PAGE_PAT)] = _PAGE_CACHE_MODE_WB, - [__pte2cm_idx(_PAGE_PWT | 0 | _PAGE_PAT)] = _PAGE_CACHE_MODE_UC_MINUS, + [__pte2cm_idx(_PAGE_PWT | 0 | _PAGE_PAT)] = _PAGE_CACHE_MODE_WT, [__pte2cm_idx(0 | _PAGE_PCD | _PAGE_PAT)] = _PAGE_CACHE_MODE_UC_MINUS, [__pte2cm_idx(_PAGE_PWT | _PAGE_PCD | _PAGE_PAT)] = _PAGE_CACHE_MODE_UC, };