diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
| commit | f630fe2817601314b2eb7ca5ddc23c7834646731 (patch) | |
| tree | 3bfb4939b7bbc3859575ca8b58fa3f929b015941 /arch/i386/kernel/microcode.c | |
| parent | 48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (diff) | |
| parent | 8a03d9a498eaf02c8a118752050a5154852c13bf (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'arch/i386/kernel/microcode.c')
| -rw-r--r-- | arch/i386/kernel/microcode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/microcode.c b/arch/i386/kernel/microcode.c index 381252bae3d8..b8f16633a6ec 100644 --- a/arch/i386/kernel/microcode.c +++ b/arch/i386/kernel/microcode.c | |||
| @@ -384,7 +384,7 @@ static int do_microcode_update (void) | |||
| 384 | { | 384 | { |
| 385 | long cursor = 0; | 385 | long cursor = 0; |
| 386 | int error = 0; | 386 | int error = 0; |
| 387 | void *new_mc; | 387 | void *new_mc = NULL; |
| 388 | int cpu; | 388 | int cpu; |
| 389 | cpumask_t old; | 389 | cpumask_t old; |
| 390 | 390 | ||