diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-26 09:44:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-26 09:44:32 -0700 |
| commit | b82287587ef9917afbea5fcbf7aa63424b6f3719 (patch) | |
| tree | 4b27b46c41ea9d26ee44f1f0f7e8ddcd3a17f6a2 /arch/x86/mm | |
| parent | 2a8a2719be1397c64e726ccd1c0933a11dc493d0 (diff) | |
| parent | 5afca33a43786408ce74540b54855973dde32bab (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-misc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-misc: (28 commits)
x86: section mismatch fixes, #3
x86: section mismatch fixes, #2
x86: pgtable_32.h - prototype and section mismatch fixes
x86: unlock_ExtINT_logic() - fix section mismatch warnings
x86: uniq_ioapic_id - fix section mismatch warning
x86: trampoline_32.S - switch to .cpuinit.data
x86: use get_bios_ebda()
x86: remove duplicate get_bios_ebda() from rio.h
x86: get_bios_ebda() requires asm/io.h
x86: use cpumask function for present, possible, and online cpus
x86: cleanup div_sc() usage
x86: cleanup clocksource_hz2mult usage
x86: remove unnecessary memset and NULL check after alloc_bootmem()
x86: use bitmap library for pin_programmed
x86: use MP_intsrc_info()
x86: use BUILD_BUG_ON() for the size of struct intel_mp_floating
x86_64 ia32 ptrace: convert to compat_arch_ptrace
x86_64 ia32 ptrace: use compat_ptrace_request for siginfo
x86 signals: lift set_fs
x86 signals: lift flags diddling code
...
Diffstat (limited to 'arch/x86/mm')
| -rw-r--r-- | arch/x86/mm/init_32.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index baf7c4f643c8..4a4761892951 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c @@ -566,9 +566,9 @@ void __init paging_init(void) /* * Test if the WP bit works in supervisor mode. It isn't supported on 386's - * and also on some strange 486's (NexGen etc.). All 586+'s are OK. This - * used to involve black magic jumps to work around some nasty CPU bugs, - * but fortunately the switch to using exceptions got rid of all that. + * and also on some strange 486's. All 586+'s are OK. This used to involve + * black magic jumps to work around some nasty CPU bugs, but fortunately the + * switch to using exceptions got rid of all that. */ static void __init test_wp_bit(void) { |