x86/kernel/cpu: Change type of x86_cache_size variable to unsigned int
Subsystems (2)
PATCH 1/1 x86/kernel/cpu: Change type of x86_cache_size variable to unsigned int
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.
Addresses-Coverity-ID: 1464429
Suggested-by Thomas Gleixner <[email protected]>
Signed-off-by Gustavo A. R. Silva <[email protected]>
--- arch/x86/include/asm/processor.h | 2 +- arch/x86/kernel/cpu/common.c | 2 +- arch/x86/kernel/cpu/microcode/intel.c | 2 +- arch/x86/kernel/cpu/proc.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-)
arch/x86/include/asm/processor.h +1 -1
@@ -109,7 +109,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
@@ -1184,7 +1184,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_mask =0 ;/* So far unknown... */ c->x86_vendor_id[0 ] ='\0' ;/* Unset */
arch/x86/kernel/cpu/microcode/intel.c +1 -1
@@ -982,7 +982,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
@@ -91,8 +91,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);
Signature · 1 line
2.7.4
tip-bot for Gustavo A. R. Silva
merge bot[tip:x86/pti] x86/cpu: Change type of x86_cache_size variable to unsigned int
x86/cpu: Change type of x86_cache_size variable to unsigned int
Commit-ID: 0bfa9f1c5d3d290461f554520b8f24316ec971e0 Gitweb: https://git.kernel.org/tip/0bfa9f1c5d3d290461f554520b8f24316ec971e0 Author: Gustavo A. R. Silva <[email protected]> AuthorDate: Tue, 13 Feb 2018 13:22:08 -0600 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 14 Feb 2018 09:14:44 +0100
x86/cpu: Change type of x86_cache_size variable to unsigned int
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 Thomas Gleixner <[email protected]>
Signed-off-by Gustavo A. R. Silva <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc Linus Torvalds <[email protected]>
Cc Peter Zijlstra <[email protected]>
Addresses-Coverity-ID: 1464429
Signed-off-by Ingo Molnar <[email protected]>
--- arch/x86/include/asm/processor.h | 2 +- arch/x86/kernel/cpu/common.c | 2 +- arch/x86/kernel/cpu/microcode/intel.c | 2 +- arch/x86/kernel/cpu/proc.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-)
arch/x86/include/asm/processor.h +1 -1
@@ -109,7 +109,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
@@ -1184,7 +1184,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
@@ -982,7 +982,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
@@ -91,8 +91,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);
tip-bot for Gustavo A. R. Silva
merge bot[tip:x86/pti] x86/cpu: Change type of x86_cache_size variable to unsigned int
In reply to Gustavo A. R. Silvax86/cpu: Change type of x86_cache_size variable to unsigned int
Commit-ID: 24dbc6000f4b9b0ef5a9daecb161f1907733765a Gitweb: https://git.kernel.org/tip/24dbc6000f4b9b0ef5a9daecb161f1907733765a Author: Gustavo A. R. Silva <[email protected]> AuthorDate: Tue, 13 Feb 2018 13:22:08 -0600 Committer: Ingo Molnar <[email protected]> CommitDate: Thu, 15 Feb 2018 01:15:53 +0100
x86/cpu: Change type of x86_cache_size variable to unsigned int
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 Thomas Gleixner <[email protected]>
Signed-off-by Gustavo A. R. Silva <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc Linus Torvalds <[email protected]>
Cc Peter Zijlstra <[email protected]>
Addresses-Coverity-ID: 1464429
Signed-off-by Ingo Molnar <[email protected]>
--- arch/x86/include/asm/processor.h | 2 +- arch/x86/kernel/cpu/common.c | 2 +- arch/x86/kernel/cpu/microcode/intel.c | 2 +- arch/x86/kernel/cpu/proc.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-)
arch/x86/include/asm/processor.h +1 -1
@@ -109,7 +109,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
@@ -1184,7 +1184,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
@@ -982,7 +982,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
@@ -91,8 +91,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);