diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-06-01 15:13:02 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-06-01 15:25:31 -0700 |
| commit | 48b1fddbb100a64f3983ca9768b8ea629a09aa20 (patch) | |
| tree | 7cf552c623cb0aa0dd945df55b7eaf5a0697e277 /fs/proc/base.c | |
| parent | 38736072d45488fd45f076388b6570419bbbc682 (diff) | |
| parent | ee4c24a5c9b530481394132c8dbc10572d57c075 (diff) | |
Merge branch 'irq/numa' into x86/mce3
Merge reason: arch/x86/kernel/irqinit_{32,64}.c unified in irq/numa
and modified in x86/mce3; this merge resolves the conflict.
Conflicts:
arch/x86/kernel/irqinit.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
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 fb45615943c2..3326bbf9ab95 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -1956,7 +1956,7 @@ static struct dentry *proc_pident_instantiate(struct inode *dir, const struct pid_entry *p = ptr; struct inode *inode; struct proc_inode *ei; - struct dentry *error = ERR_PTR(-EINVAL); + struct dentry *error = ERR_PTR(-ENOENT); inode = proc_pid_make_inode(dir->i_sb, task); if (!inode) |