diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-08 13:25:10 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-08 13:25:10 -0800 |
| commit | 343036cea2854acf8d4b4c930c0063223bc6b8a2 (patch) | |
| tree | 8d4f5ea0ce3cb74ab6051c89ac20606b74d17e42 /arch/x86/include | |
| parent | 4d2a914239eee6fcddd12a7c9c32e135dde8f3f1 (diff) | |
| parent | 8cc2361bd00e87aab2827a3996a71fe9b2c9f9c4 (diff) | |
| download | blackbird-op-linux-343036cea2854acf8d4b4c930c0063223bc6b8a2.tar.gz blackbird-op-linux-343036cea2854acf8d4b4c930c0063223bc6b8a2.zip | |
Merge branch 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: ucode-amd: Move family check to microcde_amd.c's init function
x86, ucode-amd: Ensure ucode update on suspend/resume after CPU off/online cycle
x86: ucode-amd: Convert printk(KERN_*...) to pr_*(...)
x86: ucode-amd: Don't warn when no ucode is available for a CPU revision
x86: ucode-amd: Load ucode-patches once and not separately of each CPU
x86, amd-ucode: Remove needless log messages
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/microcode.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/include/asm/microcode.h b/arch/x86/include/asm/microcode.h index ef51b501e22a..c24ca9a56458 100644 --- a/arch/x86/include/asm/microcode.h +++ b/arch/x86/include/asm/microcode.h @@ -12,6 +12,8 @@ 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); |
