www.usr.com/support/gpl/USR9113_release1.0.tar.gz

[bcm963xx.git] / kernel / linux / mm / oom_kill.c

diff --git a/kernel/linux/mm/oom_kill.c b/kernel/linux/mm/oom_kill.c
index 9bcd259..74bce7d 100755 (executable)
--- a/kernel/linux/mm/oom_kill.c
+++ b/kernel/linux/mm/oom_kill.c
@@ -266,6 +266,11 @@ void out_of_memory(int gfp_mask)
        if (since < HZ*5)
                goto out_unlock;
 
+#if defined(CONFIG_MIPS_BRCM)
+    /* Killing processes on an embedded system won't help */
+    /* Print a warning message instead */
+    printk("Warning: Low memory condition - consider removing some software components\n");
+#else
        /*
         * Ok, really out of memory. Kill something.
         */
@@ -278,6 +283,7 @@ void out_of_memory(int gfp_mask)
        spin_unlock(&oom_lock);
        oom_kill();
        spin_lock(&oom_lock);
+#endif    
 
 reset:
        /*