diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 10:14:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 10:14:56 -0700 |
| commit | 41e0e0738cf864f4f49b11aac804496999b311d9 (patch) | |
| tree | 0616361f85ae1181815c8c6afcaa767c142aac1d /arch/x86/kernel/early-quirks.c | |
| parent | e7fd3b4669f5b835c8afce28425d9f698a558115 (diff) | |
| parent | 344c21c32287755b5cda0eeb84adb4546a57c1db (diff) | |
| download | talos-op-linux-41e0e0738cf864f4f49b11aac804496999b311d9.tar.gz talos-op-linux-41e0e0738cf864f4f49b11aac804496999b311d9.zip | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, AMD: Set ARAT feature on AMD processors
x86, quirk: Fix SB600 revision check
x86: stop_machine_text_poke() should issue sync_core()
x86, amd-nb: Misc cleanliness fixes
Diffstat (limited to 'arch/x86/kernel/early-quirks.c')
| -rw-r--r-- | arch/x86/kernel/early-quirks.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c index 9efbdcc56425..3755ef494390 100644 --- a/arch/x86/kernel/early-quirks.c +++ b/arch/x86/kernel/early-quirks.c @@ -159,7 +159,12 @@ static void __init ati_bugs_contd(int num, int slot, int func) if (rev >= 0x40) acpi_fix_pin2_polarity = 1; - if (rev > 0x13) + /* + * SB600: revisions 0x11, 0x12, 0x13, 0x14, ... + * SB700: revisions 0x39, 0x3a, ... + * SB800: revisions 0x40, 0x41, ... + */ + if (rev >= 0x39) return; if (acpi_use_timer_override) |
