projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[powerpc.git]
/
mm
/
oom_kill.c
diff --git
a/mm/oom_kill.c
b/mm/oom_kill.c
index
d46ed0f
..
b9af136
100644
(file)
--- a/
mm/oom_kill.c
+++ b/
mm/oom_kill.c
@@
-225,7
+225,7
@@
static struct task_struct *select_bad_process(unsigned long *ppoints)
* CAP_SYS_RAW_IO set, send SIGTERM instead (but it's unlikely that
* we select a process with CAP_SYS_RAW_IO set).
*/
* CAP_SYS_RAW_IO set, send SIGTERM instead (but it's unlikely that
* we select a process with CAP_SYS_RAW_IO set).
*/
-static void __oom_kill_task(
task_
t *p, const char *message)
+static void __oom_kill_task(
struct task_struc
t *p, const char *message)
{
if (p->pid == 1) {
WARN_ON(1);
{
if (p->pid == 1) {
WARN_ON(1);
@@
-255,10
+255,10
@@
static void __oom_kill_task(task_t *p, const char *message)
force_sig(SIGKILL, p);
}
force_sig(SIGKILL, p);
}
-static int oom_kill_task(
task_
t *p, const char *message)
+static int oom_kill_task(
struct task_struc
t *p, const char *message)
{
struct mm_struct *mm;
{
struct mm_struct *mm;
-
task_t * g, *
q;
+
struct task_struct *g, *
q;
mm = p->mm;
mm = p->mm;
@@
-316,7
+316,7
@@
static int oom_kill_process(struct task_struct *p, unsigned long points,
*/
void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask, int order)
{
*/
void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask, int order)
{
-
task_
t *p;
+
struct task_struc
t *p;
unsigned long points = 0;
if (printk_ratelimit()) {
unsigned long points = 0;
if (printk_ratelimit()) {