projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
perf/core: Change the default paranoia level to 2
[cascardo/linux.git]
/
kernel
/
events
/
ring_buffer.c
diff --git
a/kernel/events/ring_buffer.c
b/kernel/events/ring_buffer.c
index
1faad2c
..
c61f0cb
100644
(file)
--- a/
kernel/events/ring_buffer.c
+++ b/
kernel/events/ring_buffer.c
@@
-746,8
+746,10
@@
struct ring_buffer *rb_alloc(int nr_pages, long watermark, int cpu, int flags)
rb->user_page = all_buf;
rb->data_pages[0] = all_buf + PAGE_SIZE;
- rb->page_order = ilog2(nr_pages);
- rb->nr_pages = !!nr_pages;
+ if (nr_pages) {
+ rb->nr_pages = 1;
+ rb->page_order = ilog2(nr_pages);
+ }
ring_buffer_init(rb, watermark, flags);