diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-12-07 09:49:48 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-12-07 09:49:51 +0300 |
| commit | 10a18d7dc0d9f12483c95ffc234118e9b80edfeb (patch) | |
| tree | 0f43620107d5231cab669bca4b3c923b721330c7 /fs/proc/base.c | |
| parent | f984ba4eb575e4a27ed28a76d4126d2aa9233c32 (diff) | |
| parent | cf7d7e5a1980d1116ee152d25dac382b112b9c17 (diff) | |
| download | linux-10a18d7dc0d9f12483c95ffc234118e9b80edfeb.tar.xz | |
Merge commit 'v2.6.37-rc5' into perf/core
Merge reason: Pick up the latest -rc.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/proc/base.c')
| -rw-r--r-- | fs/proc/base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c index f3d02ca461ec..182845147fe4 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -1574,7 +1574,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; |