diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-01-31 08:38:17 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-01-31 08:38:17 +0100 |
| commit | f26483eaedec39b09b1f2bdfc3f0d18f86764327 (patch) | |
| tree | 4d5b94adb85d84517462d4883c59cbf3af5dd116 /arch/x86/include | |
| parent | x86/microcode/AMD: Remove struct cont_desc.eq_id (diff) | |
| parent | x86/microcode: Do not access the initrd after it has been freed (diff) | |
| download | linux-f26483eaedec39b09b1f2bdfc3f0d18f86764327.tar.xz linux-f26483eaedec39b09b1f2bdfc3f0d18f86764327.zip | |
Merge branch 'x86/urgent' into x86/microcode, to resolve conflicts
Conflicts:
arch/x86/kernel/cpu/microcode/amd.c
arch/x86/kernel/cpu/microcode/core.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include')
| -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 90b22bbdfce9..daadeeea00b1 100644 --- a/arch/x86/include/asm/microcode.h +++ b/arch/x86/include/asm/microcode.h @@ -139,6 +139,7 @@ extern void __init load_ucode_bsp(void); extern void load_ucode_ap(void); void reload_early_microcode(void); extern bool get_builtin_firmware(struct cpio_data *cd, const char *name); +extern bool initrd_gone; #else static inline int __init microcode_init(void) { return 0; }; static inline void __init load_ucode_bsp(void) { } |