aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2015-06-05 15:03:32 +1000
committerMichael Ellerman <mpe@ellerman.id.au>2015-06-05 15:03:32 +1000
commit8344031b74157d8892d1855c35aee3cdcdf14308 (patch)
tree7fed6ba1e65c53cfb2f32b6decf773873c75fa42
parente306d74f1d6191bed638fe7fdadf1057ae3ec2a6 (diff)
downloadlinux-next-8344031b74157d8892d1855c35aee3cdcdf14308.tar.gz
proc-fix-page_size-limit-of-proc-pid-cmdline-fix
fix a billion min() warnings Cc: Alexey Dobriyan <adobriyan@gmail.com> Cc: Jarod Wilson <jarod@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-rw-r--r--fs/proc/base.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c
index 96adcc7d4d8990..716ee8bf3fe141 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -197,11 +197,12 @@ static int proc_root_link(struct dentry *dentry, struct path *path)
}
static ssize_t proc_pid_cmdline_read(struct file *file, char __user *buf,
- size_t count, loff_t *pos)
+ size_t _count, loff_t *pos)
{
struct task_struct *tsk;
struct mm_struct *mm;
char *page;
+ unsigned long count = _count;
unsigned long arg_start, arg_end, env_start, env_end;
unsigned long len1, len2, len;
unsigned long p;