aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2020-09-30 16:26:51 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2020-09-30 16:46:02 +0200
commitb13f03d8cd55339f2f634e6fe5e1e136d4d0084f (patch)
tree75fba8070b89e1a0e4dec4adb0e1d1e1b27cf0ca
parentworkqueue: remove call to non-existent pr_cont_pool_info (diff)
downloadrhel7-kernel-misery-b13f03d8cd55339f2f634e6fe5e1e136d4d0084f.tar.xz
rhel7-kernel-misery-b13f03d8cd55339f2f634e6fe5e1e136d4d0084f.zip
mm: oom_kill: task_uid is a direct uid_t
This is code that presumes that uid_t is some sort of union type, which it isn't, so the val member doesn't exist. Instead, use the return value directly as an integer, which is what the type is here. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
-rw-r--r--mm/oom_kill.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index b7599778fa1..ce0a4639330 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -529,7 +529,7 @@ void oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order,
set_tsk_thread_flag(victim, TIF_MEMDIE);
pr_err("Killed process %d (%s), UID %d, total-vm:%lukB, anon-rss:%lukB, file-rss:%lukB, shmem-rss:%lukB\n",
task_pid_nr(victim), victim->comm,
- task_uid(victim).val, K(victim->mm->total_vm),
+ task_uid(victim), K(victim->mm->total_vm),
K(get_mm_counter(victim->mm, MM_ANONPAGES)),
K(get_mm_counter(victim->mm, MM_FILEPAGES)),
K(get_mm_counter(victim->mm, MM_SHMEMPAGES)));