diff options
| author | Linus Torvalds | 2011-03-18 18:45:21 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2011-03-18 18:45:21 +0100 |
| commit | f2e1fbb5f2177227f71c4fc0491e531dd7acd385 (patch) | |
| tree | c45485e3cd8a04f78184ef3bd9ce6972c74ac834 /arch/x86/kernel/cpu/mtrr/generic.c | |
| parent | Merge branches 'irq-fixes-for-linus' and 'sched-fixes-for-linus' of git://git... (diff) | |
| parent | x86: Flush TLB if PGD entry is changed in i386 PAE mode (diff) | |
| download | kernel-qcow2-linux-f2e1fbb5f2177227f71c4fc0491e531dd7acd385.tar.gz kernel-qcow2-linux-f2e1fbb5f2177227f71c4fc0491e531dd7acd385.tar.xz kernel-qcow2-linux-f2e1fbb5f2177227f71c4fc0491e531dd7acd385.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: Flush TLB if PGD entry is changed in i386 PAE mode
x86, dumpstack: Correct stack dump info when frame pointer is available
x86: Clean up csum-copy_64.S a bit
x86: Fix common misspellings
x86: Fix misspelling and align params
x86: Use PentiumPro-optimized partial_csum() on VIA C7
Diffstat (limited to 'arch/x86/kernel/cpu/mtrr/generic.c')
| -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 9f27228ceffd..a71efcdbb092 100644 --- a/arch/x86/kernel/cpu/mtrr/generic.c +++ b/arch/x86/kernel/cpu/mtrr/generic.c @@ -1,6 +1,6 @@ /* * This only handles 32bit MTRR on 32bit hosts. This is strictly wrong - * because MTRRs can span upto 40 bits (36bits on most modern x86) + * because MTRRs can span up to 40 bits (36bits on most modern x86) */ #define DEBUG |