aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/autofs/root.c2
-rw-r--r--kernel/cgroup.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/autofs/root.c b/fs/autofs/root.c
index 592f64037ae2..5efff3c0d886 100644
--- a/fs/autofs/root.c
+++ b/fs/autofs/root.c
@@ -214,7 +214,7 @@ static struct dentry *autofs_root_lookup(struct inode *dir, struct dentry *dentr
214 214
215 oz_mode = autofs_oz_mode(sbi); 215 oz_mode = autofs_oz_mode(sbi);
216 DPRINTK(("autofs_lookup: pid = %u, pgrp = %u, catatonic = %d, " 216 DPRINTK(("autofs_lookup: pid = %u, pgrp = %u, catatonic = %d, "
217 "oz_mode = %d\n", pid_nr(task_pid(current)), 217 "oz_mode = %d\n", task_pid_nr(current),
218 task_pgrp_nr(current), sbi->catatonic, 218 task_pgrp_nr(current), sbi->catatonic,
219 oz_mode)); 219 oz_mode));
220 220
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index ca38db223f84..c2f12a49dff2 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -1763,7 +1763,7 @@ static int pid_array_load(pid_t *pidarray, int npids, struct cgroup *cont)
1763 while ((tsk = cgroup_iter_next(cont, &it))) { 1763 while ((tsk = cgroup_iter_next(cont, &it))) {
1764 if (unlikely(n == npids)) 1764 if (unlikely(n == npids))
1765 break; 1765 break;
1766 pidarray[n++] = pid_nr(task_pid(tsk)); 1766 pidarray[n++] = task_pid_nr(tsk);
1767 } 1767 }
1768 cgroup_iter_end(cont, &it); 1768 cgroup_iter_end(cont, &it);
1769 return n; 1769 return n;