diff --git a/[refs] b/[refs] index 177ecf617f33..92042ea636d1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f53173e47dee5f7514d264796bec58d43ed0f67f +refs/heads/master: 9985c20f9e4aee6857c08246b273a3695a52b929 diff --git a/trunk/kernel/events/core.c b/trunk/kernel/events/core.c index 0567e32d71aa..b8785e26ee1c 100644 --- a/trunk/kernel/events/core.c +++ b/trunk/kernel/events/core.c @@ -5926,13 +5926,6 @@ static int perf_copy_attr(struct perf_event_attr __user *uattr, if (ret) return -EFAULT; - /* - * If the type exists, the corresponding creation will verify - * the attr->config. - */ - if (attr->type >= PERF_TYPE_MAX) - return -EINVAL; - if (attr->__reserved_1) return -EINVAL;