vserver 1.9.3

[linux-2.6.git] / Documentation / filesystems / proc.txt

diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt
index 9d62659..0dad0f2 100644 (file)
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
@@ -55,7 +55,7 @@ This work is  based on the 2.2.*  kernel version and the  upcoming 2.4.*. I'm
 afraid it's still far from complete, but we  hope it will be useful. As far as
 we know, it is the first 'all-in-one' document about the /proc file system. It
 is focused  on the Intel  x86 hardware,  so if you  are looking for  PPC, ARM,
 afraid it's still far from complete, but we  hope it will be useful. As far as
 we know, it is the first 'all-in-one' document about the /proc file system. It
 is focused  on the Intel  x86 hardware,  so if you  are looking for  PPC, ARM,

-SPARC, APX, etc., features, you probably  won't find what you are looking for.
+SPARC, AXP, etc., features, you probably  won't find what you are looking for.

 It also only covers IPv4 networking, not IPv6 nor other protocols - sorry. But
 additions and patches  are welcome and will  be added to this  document if you
 mail them to Bodo.
 It also only covers IPv4 networking, not IPv6 nor other protocols - sorry. But
 additions and patches  are welcome and will  be added to this  document if you
 mail them to Bodo.


@@ -169,16 +169,18 @@ information. The  statm  file  contains  more  detailed  information about the
 process memory usage. Its seven fields are explained in Table 1-2.
 
 
 process memory usage. Its seven fields are explained in Table 1-2.
 
 

-Table 1-2: Contents of the statm files 
+Table 1-2: Contents of the statm files (as of 2.6.8-rc3)

 ..............................................................................
 ..............................................................................

- File     Content                         
- size     total program size              
- resident size of memory portions         
- shared   number of pages that are shared 
- trs      number of pages that are 'code' 
- drs      number of pages of data/stack   
- lrs      number of pages of library      
- dt       number of dirty pages           
+ Field    Content
+ size     total program size (pages)           (same as VmSize in status)
+ resident size of memory portions (pages)      (same as VmRSS in status)
+ shared   number of pages that are shared      (i.e. backed by a file)
+ trs      number of pages that are 'code'      (not including libs; broken,
+                                                       includes data segment)
+ lrs      number of pages of library           (always 0 on 2.6)
+ drs      number of pages of data/stack                (including libs; broken,
+                                                       includes library text)
+ dt       number of dirty pages                        (always 0 on 2.6)

 ..............................................................................
 
 1.2 Kernel data
 ..............................................................................
 
 1.2 Kernel data


@@ -1109,6 +1111,23 @@ modprobe
 The location  where  the  modprobe  binary  is  located.  The kernel uses this
 program to load modules on demand.
 
 The location  where  the  modprobe  binary  is  located.  The kernel uses this
 program to load modules on demand.
 

+unknown_nmi_panic
+-----------------
+
+The value in this file affects behavior of handling NMI. When the value is
+non-zero, unknown NMI is trapped and then panic occurs. At that time, kernel
+debugging information is displayed on console.
+
+NMI switch that most IA32 servers have fires unknown NMI up, for example.
+If a system hangs up, try pressing the NMI switch.
+
+[NOTE]
+   This function and oprofile share a NMI callback. Therefore this function
+   cannot be enabled when oprofile is activated.
+   And NMI watchdog will be disabled when the value in this file is set to
+   non-zero.
+
+

 2.4 /proc/sys/vm - The virtual memory subsystem
 -----------------------------------------------
 
 2.4 /proc/sys/vm - The virtual memory subsystem
 -----------------------------------------------
 


@@ -1157,6 +1176,12 @@ for writeout by the pdflush daemons.  It is expressed in 100'ths of a second.
 Data which has been dirty in-memory for longer than this interval will be
 written out next time a pdflush daemon wakes up.
 
 Data which has been dirty in-memory for longer than this interval will be
 written out next time a pdflush daemon wakes up.
 

+legacy_va_layout
+----------------
+
+If non-zero, this sysctl disables the new 32-bit mmap mmap layout - the kernel
+will use the legacy (2.4) layout for all processes.
+

 lower_zone_protection
 ---------------------
 
 lower_zone_protection
 ---------------------