From e728f21d4d5c8c8fc101adac84d5f33334bb249a Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Mon, 26 Jun 2006 00:25:45 -0700
Subject: [PATCH] --- yaml --- r: 30242 b: refs/heads/master c:
 22c2c5d75e6ad4b9ac41269476b32ba8c9fe263f h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/fs/proc/base.c | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index a7b97d43833a..9e18e4795ff0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68602066c3327fa340899609d715781eda423751
+refs/heads/master: 22c2c5d75e6ad4b9ac41269476b32ba8c9fe263f
diff --git a/trunk/fs/proc/base.c b/trunk/fs/proc/base.c
index 6080672276d5..2e4356f5d5e3 100644
--- a/trunk/fs/proc/base.c
+++ b/trunk/fs/proc/base.c
@@ -927,10 +927,6 @@ static struct file_operations proc_oom_adjust_operations = {
 	.write		= oom_adjust_write,
 };
 
-static struct inode_operations proc_mem_inode_operations = {
-	.permission	= proc_permission,
-};
-
 #ifdef CONFIG_AUDITSYSCALL
 #define TMPBUFLEN 21
 static ssize_t proc_loginuid_read(struct file * file, char __user * buf,
@@ -1697,7 +1693,6 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
 #endif
 		case PROC_TID_MEM:
 		case PROC_TGID_MEM:
-			inode->i_op = &proc_mem_inode_operations;
 			inode->i_fop = &proc_mem_operations;
 			break;
 #ifdef CONFIG_SECCOMP