From d829efa411c2cfe1d638ee2bd5ce1e92562a8b1f Mon Sep 17 00:00:00 2001 From: Nicu Pavel Date: Fri, 28 Oct 2011 13:29:13 +0300 Subject: [PATCH 672/696] [minibox-picopc-android] Update to latest changes in vfs --- fs/proc/base.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/proc/base.c b/fs/proc/base.c index 86ea28b..e653c51 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -1153,7 +1153,7 @@ static int oom_adjust_permission(struct inode *inode, int mask, uid_t uid; struct task_struct *p; - if (flags & IPERM_FLAG_RCU) + if (flags & MAY_NOT_BLOCK) return -ECHILD; p = get_proc_task(inode); @@ -1173,7 +1173,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 = { -- 1.7.1