diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 12:03:19 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 12:03:19 -0400 |
| commit | 1f43c5393033de90bac4410352b1d2a69dcbe7ef (patch) | |
| tree | 3e6c3b9e9ea4dd6620a3b8332546a3cbbeddb1fd /arch/x86/kernel/cpu | |
| parent | c135b6592bd63925397e60425e0301f33f06c7a6 (diff) | |
| parent | e90955c26d8af318658c45caadb1d330ac6a506c (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes:
x86: fix PCI MSI breaks when booting with nosmp
x86: vget_cycles() __always_inline
x86: add more boot protocol documentation
bootprotocol: cleanup
x86: fix warning in "x86: clean up vSMP detection"
x86: !x & y typo in mtrr code
Diffstat (limited to 'arch/x86/kernel/cpu')
| -rw-r--r-- | arch/x86/kernel/cpu/mtrr/generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/mtrr/generic.c b/arch/x86/kernel/cpu/mtrr/generic.c index 353efe4f5017..5d241ce94a44 100644 --- a/arch/x86/kernel/cpu/mtrr/generic.c +++ b/arch/x86/kernel/cpu/mtrr/generic.c | |||
| @@ -90,7 +90,7 @@ u8 mtrr_type_lookup(u64 start, u64 end) | |||
| 90 | * Look of multiple ranges matching this address and pick type | 90 | * Look of multiple ranges matching this address and pick type |
| 91 | * as per MTRR precedence | 91 | * as per MTRR precedence |
| 92 | */ | 92 | */ |
| 93 | if (!mtrr_state.enabled & 2) { | 93 | if (!(mtrr_state.enabled & 2)) { |
| 94 | return mtrr_state.def_type; | 94 | return mtrr_state.def_type; |
| 95 | } | 95 | } |
| 96 | 96 | ||