1 files changed, 4 insertions, 5 deletions

diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index 99d64cd58c52..9c143739b8d7 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -1657,14 +1657,13 @@ int ring_buffer_resize(struct ring_buffer *buffer, unsigned long size,
             !cpumask_test_cpu(cpu_id, buffer->cpumask))
                 return size;
 
-        size = DIV_ROUND_UP(size, BUF_PAGE_SIZE);
-        size *= BUF_PAGE_SIZE;
+        nr_pages = DIV_ROUND_UP(size, BUF_PAGE_SIZE);
 
         /* we need a minimum of two pages */
-        if (size < BUF_PAGE_SIZE * 2)
-                size = BUF_PAGE_SIZE * 2;
+        if (nr_pages < 2)
+                nr_pages = 2;
 
-        nr_pages = DIV_ROUND_UP(size, BUF_PAGE_SIZE);
+        size = nr_pages * BUF_PAGE_SIZE;
 
         /*
          * Don't succeed if resizing is disabled, as a reader might be