Commit 77df779d authored by Sylvain 'ythier' Hitier's avatar Sylvain 'ythier' Hitier Committed by Ingo Molnar
Browse files

x86/cpu: Clean up intel_tlb_table[] 



- Remove the unneeded backslash at EOL: that's not a macro.
  And let's please checkpatch by aligning to open parenthesis.

- For 0x4f descriptor, remove " */" from the info field.

- For 0xc2 descriptor, sync the beginning of info to match the tlb_type.

(The value of info fields could be made more regular, but it's unused by
 the code and will be read only by developers, so don't bother.)

Signed-off-by: default avatarSylvain 'ythier' Hitier <sylvain.hitier@gmail.com>
Cc: Alex Shi <alex.shi@intel.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
Cc: Rik van Riel <riel@surriel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: trivial@kernel.org
Link: https://lkml.kernel.org/r/20190915090917.GA5086@lilas


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 18ec1eaf

arch/x86/kernel/cpu/intel.c

+4 −4
Original line number Diff line number Diff line
@@ -813,7 +813,7 @@ static const struct _tlb_table intel_tlb_table[] = { 
	{ 0x04, TLB_DATA_4M,		8,	" TLB_DATA 4 MByte pages, 4-way set associative" },

	{ 0x05, TLB_DATA_4M,		32,	" TLB_DATA 4 MByte pages, 4-way set associative" },

	{ 0x0b, TLB_INST_4M,		4,	" TLB_INST 4 MByte pages, 4-way set associative" },

	{ 0x4f, TLB_INST_4K,		32,	" TLB_INST 4 KByte pages */" },

	{ 0x4f, TLB_INST_4K,		32,	" TLB_INST 4 KByte pages" },

	{ 0x50, TLB_INST_ALL,		64,	" TLB_INST 4 KByte and 2-MByte or 4-MByte pages" },

	{ 0x51, TLB_INST_ALL,		128,	" TLB_INST 4 KByte and 2-MByte or 4-MByte pages" },

	{ 0x52, TLB_INST_ALL,		256,	" TLB_INST 4 KByte and 2-MByte or 4-MByte pages" },
@@ -841,7 +841,7 @@ static const struct _tlb_table intel_tlb_table[] = { 
	{ 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" },

	{ 0xc2, TLB_DATA_2M_4M,		16,	" DTLB 2 MByte/4MByte pages, 4-way associative" },

	{ 0xc2, TLB_DATA_2M_4M,		16,	" TLB_DATA 2 MByte/4MByte pages, 4-way associative" },

	{ 0xca, STLB_4K,		512,	" STLB 4 KByte pages, 4-way associative" },

	{ 0x00, 0, 0 }

};
@@ -853,7 +853,7 @@ static void intel_tlb_lookup(const unsigned char desc) 
		return;



	/* look up this descriptor in the table */

	for (k = 0; intel_tlb_table[k].descriptor != desc && \

	for (k = 0; intel_tlb_table[k].descriptor != desc &&

	     intel_tlb_table[k].descriptor != 0; k++)

		;