summaryrefslogtreecommitdiff
path: root/fs/proc
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@nvidia.com>2011-10-23 00:19:18 -0700
committerDan Willemsen <dwillemsen@nvidia.com>2011-11-30 21:52:34 -0800
commit6b8121f30d001e2cbae6ede6822f70c73dc3100a (patch)
tree32edee2c1d52b1d3390805fb1950537e84d07d2f /fs/proc
parentc788a318f6d5e8ebf44286fedddad6c15c4a617c (diff)
HACK merge fixups for compile
Rebase-Id: Rbc628711479b187a90437bea94776066c7a58b54
Diffstat (limited to 'fs/proc')
-rw-r--r--fs/proc/base.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c
index 86ea28bcec5a..445777158609 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -1147,13 +1147,12 @@ out:
return err < 0 ? err : count;
}
-static int oom_adjust_permission(struct inode *inode, int mask,
- unsigned int flags)
+static int oom_adjust_permission(struct inode *inode, int mask)
{
uid_t uid;
struct task_struct *p;
- if (flags & IPERM_FLAG_RCU)
+ if (mask & MAY_NOT_BLOCK)
return -ECHILD;
p = get_proc_task(inode);
@@ -1173,7 +1172,7 @@ static int oom_adjust_permission(struct inode *inode, int mask,
}
/* Fall back to default. */
- return generic_permission(inode, mask, flags, NULL);
+ return generic_permission(inode, mask);
}
static const struct inode_operations proc_oom_adjust_inode_operations = {