X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel.spec;h=2900f392d656f69ebc3b46fb65fbfcfe8ac0d758;hb=f16be1f58675db2b2bffb684ca96d9c5b06f3b26;hp=b2d5156134b449c794c2692c1e6ded0418b71d85;hpb=aea623b24d9007e75d444783e55b9652507e8a86;p=linux-2.6.git

diff --git a/kernel.spec b/kernel.spec
index b2d515613..2900f392d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1865,7 +1865,8 @@ Patch90525: linux-2.6-525-sknid-elevator.patch
 #Patch90527:  linux-2.6-527-iptables-classify-add-mark.patch
 #
 Patch90530: linux-2.6-530-built-by-support.patch
-Patch90540: linux-2.6-540-oom-kill.patch
+# /proc/sys/vm/panic_on_oom ?
+#Patch90540: linux-2.6-540-oom-kill.patch
 Patch90550: linux-2.6-550-raise-default-nfile-ulimit.patch
 Patch90570:  linux-2.6-570-tagxid.patch
 Patch90580:  linux-2.6-580-show-proc-virt.patch
@@ -3512,7 +3513,7 @@ ApplyPatch linux-2.6-525-sknid-elevator.patch
 #ApplyPatch linux-2.6-527-iptables-classify-add-mark.patch
 #
 ApplyPatch linux-2.6-530-built-by-support.patch
-ApplyPatch linux-2.6-540-oom-kill.patch
+#ApplyPatch linux-2.6-540-oom-kill.patch
 ApplyPatch linux-2.6-550-raise-default-nfile-ulimit.patch
 ApplyPatch linux-2.6-570-tagxid.patch
 ApplyPatch linux-2.6-580-show-proc-virt.patch