diff options
author | Andreas Herrmann <andreas.herrmann3@amd.com> | 2010-01-22 21:34:56 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-01-23 06:21:59 +0100 |
commit | 3b2e3d85aeb80769fb96c15ee4f6e14135328471 (patch) | |
tree | bbf76624a4732792825031e750bc44f4007850ea /arch/x86/include/asm/microcode.h | |
parent | 73472a46b5b28116b145fb5fc05242c1aa8e1461 (diff) | |
download | linux-stable-3b2e3d85aeb80769fb96c15ee4f6e14135328471.tar.gz linux-stable-3b2e3d85aeb80769fb96c15ee4f6e14135328471.tar.bz2 linux-stable-3b2e3d85aeb80769fb96c15ee4f6e14135328471.zip |
Revert "x86: ucode-amd: Load ucode-patches once ..."
Commit d1c84f79a6ba992dc01e312c44a21496303874d6
leads to a regression when microcode_amd.c is compiled into the kernel.
It causes a big boot delay because the firmware is not available.
See http://marc.info/?l=linux-kernel&m=126267290920060
It also renders the reload sysfs attribute useless.
Fixing this is too intrusive for an -rc5 kernel.
Thus I'd like to restore the microcode loading behaviour of kernel
2.6.32.
CC: Gene Heskett <gene.heskett@verizon.net>
Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com>
LKML-Reference: <20100122203456.GB13792@alberich.amd.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/include/asm/microcode.h')
-rw-r--r-- | arch/x86/include/asm/microcode.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/include/asm/microcode.h b/arch/x86/include/asm/microcode.h index c24ca9a56458..ef51b501e22a 100644 --- a/arch/x86/include/asm/microcode.h +++ b/arch/x86/include/asm/microcode.h @@ -12,8 +12,6 @@ struct device; enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND }; struct microcode_ops { - void (*init)(struct device *device); - void (*fini)(void); enum ucode_state (*request_microcode_user) (int cpu, const void __user *buf, size_t size); |