diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-01-03 04:15:11 -0500 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-01-03 04:15:11 -0500 |
| commit | 1fef891761ddcbd7e57ec3961a0fb748003222ac (patch) | |
| tree | d192f1677521e17f1a943f8df570dd6449aa0da8 /fs/proc | |
| parent | d3d4b60b12369eded0ea0c5dffee0888ec4d80cd (diff) | |
| parent | 1d3f33d541312acd34bd2fa780396d111a0f73b1 (diff) | |
Merge branch 'sgu/mxs-core-v8' of git://git.pengutronix.de/git/ukl/linux-2.6 into imx-for-2.6.38-new
Diffstat (limited to 'fs/proc')
| -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) | |||
| 1574 | if (!tmp) | 1574 | if (!tmp) |
| 1575 | return -ENOMEM; | 1575 | return -ENOMEM; |
| 1576 | 1576 | ||
| 1577 | pathname = d_path_with_unreachable(path, tmp, PAGE_SIZE); | 1577 | pathname = d_path(path, tmp, PAGE_SIZE); |
| 1578 | len = PTR_ERR(pathname); | 1578 | len = PTR_ERR(pathname); |
| 1579 | if (IS_ERR(pathname)) | 1579 | if (IS_ERR(pathname)) |
| 1580 | goto out; | 1580 | goto out; |