aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/events
diff options
context:
space:
mode:
authorKaixu Xia <xiakaixu@huawei.com>2015-01-27 04:55:12 -0500
committerArnaldo Carvalho de Melo <acme@redhat.com>2015-02-13 09:40:30 -0500
commit74390aa5567827add5058a3b26eff0ed06a629ba (patch)
treee0deaad7ad8a9667f277f334282358e89dd4a6b6 /kernel/events
parent3a03005ff9445834f3d3b577a11bcbdbdf7a89cf (diff)
perf: Remove the extra validity check on nr_pages
The function is_power_of_2() also do the check on nr_pages, so the first check performed is unnecessary. On the other hand, the key point is to ensure @nr_pages is a power-of-two number and mostly @nr_pages is a nonzero value, so in the most cases, the function is_power_of_2() will be called. Signed-off-by: Kaixu Xia <xiakaixu@huawei.com> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Paul Mackerras <paulus@samba.org> Link: http://lkml.kernel.org/r/1422352512-75150-1-git-send-email-xiakaixu@huawei.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'kernel/events')
-rw-r--r--kernel/events/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 7f2fbb8b5069..0969c9b67eec 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -4420,7 +4420,7 @@ static int perf_mmap(struct file *file, struct vm_area_struct *vma)
4420 * If we have rb pages ensure they're a power-of-two number, so we 4420 * If we have rb pages ensure they're a power-of-two number, so we
4421 * can do bitmasks instead of modulo. 4421 * can do bitmasks instead of modulo.
4422 */ 4422 */
4423 if (nr_pages != 0 && !is_power_of_2(nr_pages)) 4423 if (!is_power_of_2(nr_pages))
4424 return -EINVAL; 4424 return -EINVAL;
4425 4425
4426 if (vma_size != PAGE_SIZE * (1 + nr_pages)) 4426 if (vma_size != PAGE_SIZE * (1 + nr_pages))