diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-03 18:44:50 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-03 18:44:50 -0400 |
| commit | c33c40549ef8f080d8aa0545d043d9f01bf804a9 (patch) | |
| tree | 0cf57d089c915307895baa484ce2bfa827248649 /arch/x86/include/asm/microcode.h | |
| parent | e30c631be68b3885aee1b813c427354c950f4146 (diff) | |
| parent | 65cef1311d5d212fd3d48a43678536dc878ca288 (diff) | |
Merge branch 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
Pull x86 microcode changes from Ingo Molnar:
"A microcode-debugging boot flag plus related refactoring"
* 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, microcode: Add a disable chicken bit
x86, boot: Carve out early cmdline parsing function
Diffstat (limited to 'arch/x86/include/asm/microcode.h')
| -rw-r--r-- | arch/x86/include/asm/microcode.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/microcode.h b/arch/x86/include/asm/microcode.h index b59827e76529..64dc362506b7 100644 --- a/arch/x86/include/asm/microcode.h +++ b/arch/x86/include/asm/microcode.h | |||
| @@ -25,6 +25,7 @@ struct cpu_signature { | |||
| 25 | struct device; | 25 | struct device; |
| 26 | 26 | ||
| 27 | enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND }; | 27 | enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND }; |
| 28 | extern bool dis_ucode_ldr; | ||
| 28 | 29 | ||
| 29 | struct microcode_ops { | 30 | struct microcode_ops { |
| 30 | enum ucode_state (*request_microcode_user) (int cpu, | 31 | enum ucode_state (*request_microcode_user) (int cpu, |