forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge commit 'origin/master' into next

Browse source
This commit is contained in:
Benjamin Herrenschmidt 2009-11-24 17:16:30 +11:00
commit 1e43bee9c7
237 changed files with 2255 additions and 1580 deletions
Download patch file Download diff file Expand all files Collapse all files

2
fs/proc/array.c
View file

@ -571,7 +571,7 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
rsslim,
mm ? mm->start_code : 0,
mm ? mm->end_code : 0,
(permitted) ? task->stack_start : 0,
(permitted && mm) ? task->stack_start : 0,
esp,
eip,
/* The signal information here is obsolete.

3
fs/proc/base.c
View file

@ -2597,8 +2597,7 @@ static void proc_flush_task_mnt(struct vfsmount *mnt, pid_t pid, pid_t tgid)
name.len = snprintf(buf, sizeof(buf), "%d", pid);
dentry = d_hash_and_lookup(mnt->mnt_root, &name);
if (dentry) {
if (!(current->flags & PF_EXITING))
shrink_dcache_parent(dentry);
shrink_dcache_parent(dentry);
d_drop(dentry);
dput(dentry);
}