Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa72eecb authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Greg Kroah-Hartman
Browse files

x86/cpu: Change type of x86_cache_size variable to unsigned int 



commit 24dbc6000f4b9b0ef5a9daecb161f1907733765a upstream.

Currently, x86_cache_size is of type int, which makes no sense as we
will never have a valid cache size equal or less than 0. So instead of
initializing this variable to -1, it can perfectly be initialized to 0
and use it as an unsigned variable instead.

Suggested-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarGustavo A. R. Silva <garsilva@embeddedor.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Addresses-Coverity-ID: 1464429
Link: http://lkml.kernel.org/r/20180213192208.GA26414@embeddedor.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 14eb4136

arch/x86/include/asm/processor.h

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ struct cpuinfo_x86 { 
	char			x86_vendor_id[16];

	char			x86_model_id[64];

	/* in KB - valid for CPUS which support this call: */

	int			x86_cache_size;

	unsigned int		x86_cache_size;

	int			x86_cache_alignment;	/* In bytes */

	/* Cache QoS architectural values: */

	int			x86_cache_max_rmid;	/* max index */

arch/x86/kernel/cpu/common.c

+1 −1
Original line number Diff line number Diff line
@@ -1144,7 +1144,7 @@ static void identify_cpu(struct cpuinfo_x86 *c) 
	int i;



	c->loops_per_jiffy = loops_per_jiffy;

	c->x86_cache_size = -1;

	c->x86_cache_size = 0;

	c->x86_vendor = X86_VENDOR_UNKNOWN;

	c->x86_model = c->x86_stepping = 0;	/* So far unknown... */

	c->x86_vendor_id[0] = '\0'; /* Unset */

arch/x86/kernel/cpu/microcode/intel.c

+1 −1
Original line number Diff line number Diff line
@@ -1132,7 +1132,7 @@ static struct microcode_ops microcode_intel_ops = { 


static int __init calc_llc_size_per_core(struct cpuinfo_x86 *c)

{

	u64 llc_size = c->x86_cache_size * 1024;

	u64 llc_size = c->x86_cache_size * 1024ULL;



	do_div(llc_size, c->x86_max_cores);

arch/x86/kernel/cpu/proc.c

+2 −2
Original line number Diff line number Diff line
@@ -87,8 +87,8 @@ static int show_cpuinfo(struct seq_file *m, void *v) 
	}



	/* Cache size */

	if (c->x86_cache_size >= 0)

		seq_printf(m, "cache size\t: %d KB\n", c->x86_cache_size);

	if (c->x86_cache_size)

		seq_printf(m, "cache size\t: %u KB\n", c->x86_cache_size);



	show_cpuinfo_core(m, c, cpu);

	show_cpuinfo_misc(m, c);