Merge tag 'upstream-4.6-rc1' of git://git.infradead.org/linux-ubifs

[deliverable/linux.git] / kernel / events / ring_buffer.c

diff --git a/kernel/events/ring_buffer.c b/kernel/events/ring_buffer.c
index 1faad2cfdb9e4572c91431e4b11941266e23a231..c61f0cbd308b5b4456e69c1539f9b334a34c0632 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);