aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/cpu/microcode
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2016-03-07 05:10:02 -0500
committerThomas Gleixner <tglx@linutronix.de>2016-03-08 03:08:45 -0500
commit7d0161569a3b66aaa01520002c3e5fd7126d071f (patch)
treefcdef5f4213d5dd22f018070ea6e8e55396e1497 /arch/x86/kernel/cpu/microcode
parentc0414622177ae4739a49ca7dad4306a681e2878b (diff)
x86/microcode/intel: Merge two consecutive if-statements
Merge the two consecutive "if (ext_table_size)". No functional change. Signed-off-by: Borislav Petkov <bp@suse.de> Link: http://lkml.kernel.org/r/1457345404-28884-4-git-send-email-bp@alien8.de Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/cpu/microcode')
-rw-r--r--arch/x86/kernel/cpu/microcode/intel_lib.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/kernel/cpu/microcode/intel_lib.c b/arch/x86/kernel/cpu/microcode/intel_lib.c
index 2b2d1354dc70..ffb1bbf45db0 100644
--- a/arch/x86/kernel/cpu/microcode/intel_lib.c
+++ b/arch/x86/kernel/cpu/microcode/intel_lib.c
@@ -68,6 +68,9 @@ int microcode_sanity_check(void *mc, int print_err)
68 } 68 }
69 ext_table_size = total_size - (MC_HEADER_SIZE + data_size); 69 ext_table_size = total_size - (MC_HEADER_SIZE + data_size);
70 if (ext_table_size) { 70 if (ext_table_size) {
71 u32 ext_table_sum = 0;
72 u32 *ext_tablep;
73
71 if ((ext_table_size < EXT_HEADER_SIZE) 74 if ((ext_table_size < EXT_HEADER_SIZE)
72 || ((ext_table_size - EXT_HEADER_SIZE) % EXT_SIGNATURE_SIZE)) { 75 || ((ext_table_size - EXT_HEADER_SIZE) % EXT_SIGNATURE_SIZE)) {
73 if (print_err) 76 if (print_err)
@@ -81,12 +84,9 @@ int microcode_sanity_check(void *mc, int print_err)
81 return -EFAULT; 84 return -EFAULT;
82 } 85 }
83 ext_sigcount = ext_header->count; 86 ext_sigcount = ext_header->count;
84 }
85 87
86 /* check extended table checksum */ 88 /* check extended table checksum */
87 if (ext_table_size) { 89 ext_tablep = (u32 *)ext_header;
88 u32 ext_table_sum = 0;
89 u32 *ext_tablep = (u32 *)ext_header;
90 90
91 i = ext_table_size / sizeof(u32); 91 i = ext_table_size / sizeof(u32);
92 while (i--) 92 while (i--)