diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-01 21:26:49 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-01 21:26:49 +0200 |
| commit | edfd222fc54664b789cec01e78d442ce9461e79b (patch) | |
| tree | 8bc66dd9e5720713dbf9cea92040ea33ae7dbf86 /arch | |
| parent | MN10300: Fix IRQ handling (diff) | |
| parent | x86, vmi: fix broken LDT access (diff) | |
| download | linux-edfd222fc54664b789cec01e78d442ce9461e79b.tar.xz linux-edfd222fc54664b789cec01e78d442ce9461e79b.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, vmi: fix broken LDT access
x86: fix typo in enable_mtrr_cleanup early parameter
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/cpu/mtrr/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c index b117d7f8a564..885c8265e6b5 100644 --- a/arch/x86/kernel/cpu/mtrr/main.c +++ b/arch/x86/kernel/cpu/mtrr/main.c @@ -834,7 +834,7 @@ static int __init enable_mtrr_cleanup_setup(char *str) enable_mtrr_cleanup = 1; return 0; } -early_param("enble_mtrr_cleanup", enable_mtrr_cleanup_setup); +early_param("enable_mtrr_cleanup", enable_mtrr_cleanup_setup); struct var_mtrr_state { unsigned long range_startk; |