projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'amd-drm-next-5.14-2021-06-09' of https://gitlab.freedesktop.org/agd5f...
[linux-2.6-microblaze.git]
/
mm
/
oom_kill.c
diff --git
a/mm/oom_kill.c
b/mm/oom_kill.c
index
fa1cf18
..
eefd3f5
100644
(file)
--- a/
mm/oom_kill.c
+++ b/
mm/oom_kill.c
@@
-74,7
+74,7
@@
static inline bool is_memcg_oom(struct oom_control *oc)
#ifdef CONFIG_NUMA
/**
#ifdef CONFIG_NUMA
/**
- * oom_cpuset_eligible() - check task eligiblity for kill
+ * oom_cpuset_eligible() - check task eligib
i
lity for kill
* @start: task struct of which task to consider
* @oc: pointer to struct oom_control
*
* @start: task struct of which task to consider
* @oc: pointer to struct oom_control
*
@@
-993,7
+993,7
@@
static void oom_kill_process(struct oom_control *oc, const char *message)
if (oom_group) {
mem_cgroup_print_oom_group(oom_group);
mem_cgroup_scan_tasks(oom_group, oom_kill_memcg_member,
if (oom_group) {
mem_cgroup_print_oom_group(oom_group);
mem_cgroup_scan_tasks(oom_group, oom_kill_memcg_member,
- (void*)message);
+ (void
*)message);
mem_cgroup_put(oom_group);
}
}
mem_cgroup_put(oom_group);
}
}