diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-14 02:21:51 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-14 02:21:51 +0200 |
| commit | e3438330f58330ec236c861d43f46bef06780e62 (patch) | |
| tree | e5bb6b31b5ee2ef0b7f4f522f7e4a792bda99dcc /arch/x86/include | |
| parent | c7b228adcafe5024a60fc246476e11af8699b759 (diff) | |
| parent | 44afe6029422da55918d8156c6900dbf5259533b (diff) | |
| download | op-kernel-dev-e3438330f58330ec236c861d43f46bef06780e62.zip op-kernel-dev-e3438330f58330ec236c861d43f46bef06780e62.tar.gz | |
Merge branch 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 microcode loading updates from Ingo Molnar:
"Misc smaller cleanups"
* 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, microcode, intel: Fix total_size computation
x86, microcode, intel: Rename apply_microcode and declare it static
x86, microcode, intel: Fix typos
x86, microcode, intel: Add missing static declarations
x86, microcode, amd: Fix missing static declaration
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/microcode_intel.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/microcode_intel.h b/arch/x86/include/asm/microcode_intel.h index 9067166..bbe296e 100644 --- a/arch/x86/include/asm/microcode_intel.h +++ b/arch/x86/include/asm/microcode_intel.h @@ -43,7 +43,7 @@ struct extended_sigtable { #define DWSIZE (sizeof(u32)) #define get_totalsize(mc) \ - (((struct microcode_intel *)mc)->hdr.totalsize ? \ + (((struct microcode_intel *)mc)->hdr.datasize ? \ ((struct microcode_intel *)mc)->hdr.totalsize : \ DEFAULT_UCODE_TOTALSIZE) |
