[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

diff --git a/Documentation/nmi_watchdog.txt b/Documentation/nmi_watchdog.txt
index 9c2f2e6bf3e084699d2d77607507de713f1287fc..c1ba4e6f1ac8d56111e6bb72290a019bc594363e 100644 (file)
--- a/Documentation/nmi_watchdog.txt
+++ b/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

diff --git a/include/asm-i386/mach-visws/mach_apic.h b/include/asm-i386/mach-visws/mach_apic.h
index 2376c50ba6e930196c2f6b8576bfae70e138b57a..ab40e5c0f3e553cd19c036986590b3c4a062c72d 100644 (file)
--- a/include/asm-i386/mach-visws/mach_apic.h
+++ b/include/asm-i386/mach-visws/mach_apic.h
@@ -1,6 +1,8 @@
 #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)

diff --git a/init/Kconfig b/init/Kconfig
index b01e44f573eba76248993f4bdd2d83cebafca96b..6d2d615c9f15105d4099cb3748de6043edff74f8 100644 (file)
--- a/init/Kconfig
+++ b/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.

diff --git a/mm/filemap.c b/mm/filemap.c
index fcc9fc2735e2e4f68700e5b86c0d4101f15900a0..0fe1ba24b8b2381fa959f09704db13448cb171f1 100644 (file)
--- a/mm/filemap.c
+++ b/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)