Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

[pandora-kernel.git] / Documentation / sysctl / vm.txt

diff --git a/Documentation/sysctl/vm.txt b/Documentation/sysctl/vm.txt
index fc5790d..6c7d18c 100644 (file)
--- a/Documentation/sysctl/vm.txt
+++ b/Documentation/sysctl/vm.txt
@@ -573,11 +573,14 @@ Because other nodes' memory may be free. This means system total status
 may be not fatal yet.
 
 If this is set to 2, the kernel panics compulsorily even on the
 may be not fatal yet.
 
 If this is set to 2, the kernel panics compulsorily even on the

-above-mentioned.
+above-mentioned. Even oom happens under memory cgroup, the whole
+system panics.

 
 The default value is 0.
 1 and 2 are for failover of clustering. Please select either
 according to your policy of failover.
 
 The default value is 0.
 1 and 2 are for failover of clustering. Please select either
 according to your policy of failover.

+panic_on_oom=2+kdump gives you very strong tool to investigate
+why oom happens. You can get snapshot.

 
 =============================================================
 
 
 =============================================================