diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-11 13:45:21 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-11 13:45:21 -0400 |
| commit | 254c44ea822066e24ab5efbdff1e43b8fe45ae76 (patch) | |
| tree | 547f6fd4ce1bd6dba6a5cc5184df28501d550795 /arch/x86/kernel/cpu/amd.c | |
| parent | 7b76415375ba91f5a06f8d5179278c03d6151d16 (diff) | |
| parent | 6ac77e469e991e9dd91b28e503fa24b5609eedba (diff) | |
Merge branch 'gic-fasteoi' of git://linux-arm.org/linux-2.6-wd into devel-stable
Diffstat (limited to 'arch/x86/kernel/cpu/amd.c')
| -rw-r--r-- | arch/x86/kernel/cpu/amd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index 3532d3bf8105..bb9eb29a52dd 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c | |||
| @@ -698,7 +698,7 @@ cpu_dev_register(amd_cpu_dev); | |||
| 698 | */ | 698 | */ |
| 699 | 699 | ||
| 700 | const int amd_erratum_400[] = | 700 | const int amd_erratum_400[] = |
| 701 | AMD_OSVW_ERRATUM(1, AMD_MODEL_RANGE(0xf, 0x41, 0x2, 0xff, 0xf), | 701 | AMD_OSVW_ERRATUM(1, AMD_MODEL_RANGE(0x0f, 0x4, 0x2, 0xff, 0xf), |
| 702 | AMD_MODEL_RANGE(0x10, 0x2, 0x1, 0xff, 0xf)); | 702 | AMD_MODEL_RANGE(0x10, 0x2, 0x1, 0xff, 0xf)); |
| 703 | EXPORT_SYMBOL_GPL(amd_erratum_400); | 703 | EXPORT_SYMBOL_GPL(amd_erratum_400); |
| 704 | 704 | ||