diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-01 01:58:38 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-01 01:58:38 -0500 |
| commit | 68727fed5469100bec0764207d7efb7a9ecdee29 (patch) | |
| tree | 7afb58ab7665b90122d3b4505be5c6c9f8bade4b /mm/oom_kill.c | |
| parent | dbfedbb98145375106cee7ec7269611d553819dc (diff) | |
| parent | b5b9d6647c1cd5eee90b58941c55f874c2a7e707 (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'mm/oom_kill.c')
| -rw-r--r-- | mm/oom_kill.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 8123fad5a485..c86c737d2433 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c | |||
| @@ -302,7 +302,7 @@ void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask, int order) | |||
| 302 | { | 302 | { |
| 303 | struct mm_struct *mm = NULL; | 303 | struct mm_struct *mm = NULL; |
| 304 | task_t *p; | 304 | task_t *p; |
| 305 | unsigned long points; | 305 | unsigned long points = 0; |
| 306 | 306 | ||
| 307 | if (printk_ratelimit()) { | 307 | if (printk_ratelimit()) { |
| 308 | printk("oom-killer: gfp_mask=0x%x, order=%d\n", | 308 | printk("oom-killer: gfp_mask=0x%x, order=%d\n", |