From: tip-bot for Yannick Guerrini <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
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
Subject: [tip:x86/urgent] x86/cpu/intel: Fix trivial typo in intel_tlb_table[]
Date: Sun, 22 Feb 2015 00:00:33 -0800 [thread overview]
Message-ID: <tip-a927792c196f1c24410f3c12ccf45238a353783a@git.kernel.org> (raw)
In-Reply-To: <1424558510-1420-1-git-send-email-yguerrini@tomshardware.fr>
Commit-ID: a927792c196f1c24410f3c12ccf45238a353783a
Gitweb: http://git.kernel.org/tip/a927792c196f1c24410f3c12ccf45238a353783a
Author: Yannick Guerrini <yguerrini@tomshardware.fr>
AuthorDate: Sat, 21 Feb 2015 23:41:50 +0100
Committer: Ingo Molnar <mingo@kernel.org>
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 <yguerrini@tomshardware.fr>
Cc: Borislav Petkov <bp@suse.de>
Cc: Bryan O'Donoghue <pure.logic@nexus-software.ie>
Cc: Chris Bainbridge <chris.bainbridge@gmail.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Steven Honeyman <stevenhoneyman@gmail.com>
Cc: trivial@kernel.org
Link: http://lkml.kernel.org/r/1424558510-1420-1-git-send-email-yguerrini@tomshardware.fr
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
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" },
prev parent reply other threads:[~2015-02-22 8:01 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-21 22:41 [PATCH] x86, cpu: Fix trivial typo in intel_tlb_table Yannick Guerrini
2015-02-22 8:00 ` tip-bot for Yannick Guerrini [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-a927792c196f1c24410f3c12ccf45238a353783a@git.kernel.org \
--to=tipbot@zytor.com \
--cc=bp@suse.de \
--cc=chris.bainbridge@gmail.com \
--cc=dave.hansen@linux.intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=pure.logic@nexus-software.ie \
--cc=stevenhoneyman@gmail.com \
--cc=tglx@linutronix.de \
--cc=yguerrini@tomshardware.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®