Messages in this thread Patch in this message | | | Date | Thu, 24 Mar 2005 19:33:16 -0500 | From | Coywolf Qi Hunt <> | Subject | [patch] oom-killer sysrq-f fix |
| |
Hello,
akpm, I saw you noticed it, http://www.ussg.iu.edu/hypermail/linux/kernel/0412.0/0424.html
Jim Nelson, this patch is to your post: 2.6.11-rc2-mm2 - kernel panic with SysRq-f
Recent make-sysrq-f-call-oom_kill.patch calls oom-killer in interrupt context, thus results into panic. This patch fixes out_of_memory() to avoid schedule when in interrupt context.
Coywolf
Signed-off-by: Coywolf Qi Hunt <coywolf@lovecn.org>
diff -pruN 2.6.12-rc1-mm2/mm/oom_kill.c 2.6.12-rc1-mm2-cy/mm/oom_kill.c --- 2.6.12-rc1-mm2/mm/oom_kill.c 2005-03-03 17:12:18.000000000 +0800 +++ 2.6.12-rc1-mm2-cy/mm/oom_kill.c 2005-03-25 08:07:19.000000000 +0800 @@ -20,6 +20,7 @@ #include <linux/swap.h> #include <linux/timex.h> #include <linux/jiffies.h> +#include <linux/hardirq.h> /* #define DEBUG */ @@ -283,6 +284,9 @@ retry: if (mm) mmput(mm); + if (in_interrupt()) + return; + /* * Give "p" a good chance of killing itself before we * retry to allocate memory. - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |