[PATCH] misc fixes

- nmi_watchdog documentation typo ("Randy.Dunlap" <rddunlap@osdl.org>)

- ikconfig proc requires CONFIG_PROC_FS ("Randy.Dunlap" <rddunlap@osdl.org>)

- visws build fix (Andrey Panin <pazke@donpac.ru>)

- VM lock ranking comment update

Documentation/nmi_watchdog.txt

@@ -12,7 +12,7 @@ This can be used to debug hard kernel lockups.  By executing periodic
 NMI interrupts, the kernel can monitor whether any CPU has locked up,
 and print out debugging messages if so.  
 
-In order to use the NMI watchdoc, you need to have APIC support in your
+In order to use the NMI watchdog, you need to have APIC support in your
 kernel. For SMP kernels, APIC support gets compiled in automatically. For
 UP, enable either CONFIG_X86_UP_APIC (Processor type and features -> Local
 APIC support on uniprocessors) or CONFIG_X86_UP_IOAPIC (Processor type and

include/asm-i386/mach-visws/mach_apic.h

 #ifndef __ASM_MACH_APIC_H
 #define __ASM_MACH_APIC_H
 
+#include <mach_apicdef.h>
+
 #define APIC_DFR_VALUE	(APIC_DFR_FLAT)
 
 #define no_balance_irq (0)

init/Kconfig

@@ -140,7 +140,7 @@ config IKCONFIG
 
 config IKCONFIG_PROC
 	bool "Enable access to .config through /proc/ikconfig"
-	depends on IKCONFIG
+	depends on IKCONFIG && PROC_FS
 	---help---
 	  This option enables access to kernel configuration file and build
 	  information through /proc/ikconfig.

mm/filemap.c

@@ -67,6 +67,9 @@
  *  ->mmap_sem
  *    ->lock_page		(access_process_vm)
  *
+ *  ->mmap_sem
+ *    ->i_sem			(msync)
+ *
  *  ->inode_lock
  *    ->sb_lock			(fs/fs-writeback.c)
  *    ->mapping->page_lock	(__sync_single_inode)