diff --git a/[refs] b/[refs] index 69d2ef6fe61e..d0ab5206414e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a2ef990ab5a6705a356d146dd773a3b359787497 +refs/heads/master: efeb156e7275c5b6c6e0f96aceb3c6abf98fc392 diff --git a/trunk/kernel/kprobes.c b/trunk/kernel/kprobes.c index e5d84644823b..95dd7212e610 100644 --- a/trunk/kernel/kprobes.c +++ b/trunk/kernel/kprobes.c @@ -2198,7 +2198,7 @@ static ssize_t write_enabled_file_bool(struct file *file, const char __user *user_buf, size_t count, loff_t *ppos) { char buf[32]; - int buf_size; + size_t buf_size; buf_size = min(count, (sizeof(buf)-1)); if (copy_from_user(buf, user_buf, buf_size))