From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751997AbbBVIBK (ORCPT ); Sun, 22 Feb 2015 03:01:10 -0500 Received: from terminus.zytor.com ([198.137.202.10]:33257 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751547AbbBVIBF (ORCPT ); Sun, 22 Feb 2015 03:01:05 -0500 Date: Sun, 22 Feb 2015 00:00:33 -0800 From: tip-bot for Yannick Guerrini Message-ID: Cc: stevenhoneyman@gmail.com, dave.hansen@linux.intel.com, pure.logic@nexus-software.ie, tglx@linutronix.de, linux-kernel@vger.kernel.org, bp@suse.de, mingo@kernel.org, yguerrini@tomshardware.fr, hpa@zytor.com, chris.bainbridge@gmail.com Reply-To: bp@suse.de, tglx@linutronix.de, linux-kernel@vger.kernel.org, stevenhoneyman@gmail.com, pure.logic@nexus-software.ie, dave.hansen@linux.intel.com, chris.bainbridge@gmail.com, hpa@zytor.com, yguerrini@tomshardware.fr, mingo@kernel.org In-Reply-To: <1424558510-1420-1-git-send-email-yguerrini@tomshardware.fr> References: <1424558510-1420-1-git-send-email-yguerrini@tomshardware.fr> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/cpu/intel: Fix trivial typo in intel_tlb_table[] Git-Commit-ID: a927792c196f1c24410f3c12ccf45238a353783a 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: a927792c196f1c24410f3c12ccf45238a353783a Gitweb: http://git.kernel.org/tip/a927792c196f1c24410f3c12ccf45238a353783a Author: Yannick Guerrini AuthorDate: Sat, 21 Feb 2015 23:41:50 +0100 Committer: Ingo Molnar CommitDate: Sun, 22 Feb 2015 08:55:58 +0100 x86/cpu/intel: Fix trivial typo in intel_tlb_table[] Change 'ssociative' to 'associative' Signed-off-by: Yannick Guerrini Cc: Borislav Petkov Cc: Bryan O'Donoghue Cc: Chris Bainbridge Cc: Dave Hansen Cc: Steven Honeyman Cc: trivial@kernel.org Link: http://lkml.kernel.org/r/1424558510-1420-1-git-send-email-yguerrini@tomshardware.fr Signed-off-by: Ingo Molnar --- arch/x86/kernel/cpu/intel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index 94d7dcb..50163fa 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c @@ -565,8 +565,8 @@ static const struct _tlb_table intel_tlb_table[] = { { 0xb2, TLB_INST_4K, 64, " TLB_INST 4KByte pages, 4-way set associative" }, { 0xb3, TLB_DATA_4K, 128, " TLB_DATA 4 KByte pages, 4-way set associative" }, { 0xb4, TLB_DATA_4K, 256, " TLB_DATA 4 KByte pages, 4-way associative" }, - { 0xb5, TLB_INST_4K, 64, " TLB_INST 4 KByte pages, 8-way set ssociative" }, - { 0xb6, TLB_INST_4K, 128, " TLB_INST 4 KByte pages, 8-way set ssociative" }, + { 0xb5, TLB_INST_4K, 64, " TLB_INST 4 KByte pages, 8-way set associative" }, + { 0xb6, TLB_INST_4K, 128, " TLB_INST 4 KByte pages, 8-way set associative" }, { 0xba, TLB_DATA_4K, 64, " TLB_DATA 4 KByte pages, 4-way associative" }, { 0xc0, TLB_DATA_4K_4M, 8, " TLB_DATA 4 KByte and 4 MByte pages, 4-way associative" }, { 0xc1, STLB_4K_2M, 1024, " STLB 4 KByte and 2 MByte pages, 8-way associative" },