Merge branch 'linus' into sched/core

Merge reason: we want to queue up dependent cleanup

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar
2010-12-08 20:15:26 +01:00
656 changed files with 15344 additions and 7041 deletions

View File

@@ -1650,7 +1650,7 @@ static int do_proc_readlink(struct path *path, char __user *buffer, int buflen)
if (!tmp)
return -ENOMEM;
pathname = d_path_with_unreachable(path, tmp, PAGE_SIZE);
pathname = d_path(path, tmp, PAGE_SIZE);
len = PTR_ERR(pathname);
if (IS_ERR(pathname))
goto out;