Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 28906
b: refs/heads/master
c: 6937a25
h: refs/heads/master
v: v3
  • Loading branch information
Dave Peterson authored and Linus Torvalds committed Jun 23, 2006
1 parent f2c4a1f commit 9089259
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: fadd8fbd153c12963f8fe3c9ef7f8967f286f98b
refs/heads/master: 6937a25cff818d32d0f9ff58a518c9ab96760aeb
6 changes: 3 additions & 3 deletions trunk/mm/oom_kill.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ int sysctl_panic_on_oom;
/* #define DEBUG */

/**
* oom_badness - calculate a numeric value for how bad this task has been
* badness - calculate a numeric value for how bad this task has been
* @p: task struct of which task we should calculate
* @uptime: current uptime in seconds
*
Expand Down Expand Up @@ -201,7 +201,7 @@ static struct task_struct *select_bad_process(unsigned long *ppoints)
continue;

/*
* This is in the process of releasing memory so for wait it
* This is in the process of releasing memory so wait for it
* to finish before killing some other task by mistake.
*/
releasing = test_tsk_thread_flag(p, TIF_MEMDIE) ||
Expand Down Expand Up @@ -307,7 +307,7 @@ static int oom_kill_process(struct task_struct *p, unsigned long points,
}

/**
* oom_kill - kill the "best" process when we run out of memory
* out_of_memory - kill the "best" process when we run out of memory
*
* If we run out of memory, we have the choice between either
* killing a random task (bad), letting the system crash (worse)
Expand Down

0 comments on commit 9089259

Please sign in to comment.