diff --git a/[refs] b/[refs] index 3518d5fa2709..d5e7b6c6391d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7bcd6b0efd5216f2f208e92150b0e5b9bea2c210 +refs/heads/master: 5e61feafa2c641c2a013ba94eec56c411011cc94 diff --git a/trunk/fs/proc/base.c b/trunk/fs/proc/base.c index 725e279c3bdf..433a01d2e992 100644 --- a/trunk/fs/proc/base.c +++ b/trunk/fs/proc/base.c @@ -1247,7 +1247,6 @@ static struct dentry *proc_fd_instantiate(struct inode *dir, goto out; } -/* SMP-safe */ static struct dentry *proc_lookupfd(struct inode * dir, struct dentry * dentry, struct nameidata *nd) { struct task_struct *task = get_proc_task(dir); @@ -1374,7 +1373,6 @@ static struct dentry *proc_pident_instantiate(struct inode *dir, return error; } -/* SMP-safe */ static struct dentry *proc_pident_lookup(struct inode *dir, struct dentry *dentry, struct pid_entry *ents, @@ -1899,7 +1897,6 @@ struct dentry *proc_pid_instantiate(struct inode *dir, return error; } -/* SMP-safe */ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, struct nameidata *nd) { struct dentry *result = ERR_PTR(-ENOENT); @@ -2106,7 +2103,6 @@ static struct dentry *proc_task_instantiate(struct inode *dir, return error; } -/* SMP-safe */ static struct dentry *proc_task_lookup(struct inode *dir, struct dentry * dentry, struct nameidata *nd) { struct dentry *result = ERR_PTR(-ENOENT);