2 files changed, 13 insertions, 9 deletions

diff --git a/kernel/events/core.c b/kernel/events/core.c
index 5e70f62752a2..e4aee519572d 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -3569,8 +3569,10 @@ static int perf_mmap(struct file *file, struct vm_area_struct *vma)
         if (vma->vm_flags & VM_WRITE)
                 flags |= RING_BUFFER_WRITABLE;
 
-        rb = rb_alloc(nr_pages, event->attr.wakeup_watermark,
-                                   event->cpu, flags);
+        rb = rb_alloc(nr_pages, 
+                event->attr.watermark ? event->attr.wakeup_watermark : 0,
+                event->cpu, flags);
+
         if (!rb) {
                 ret = -ENOMEM;
                 goto unlock;
diff --git a/kernel/events/ring_buffer.c b/kernel/events/ring_buffer.c
index fde52595d8f7..fc2701c99207 100644
--- a/kernel/events/ring_buffer.c
+++ b/kernel/events/ring_buffer.c
@@ -199,13 +199,15 @@ void perf_output_end(struct perf_output_handle *handle)
         struct perf_event *event = handle->event;
         struct ring_buffer *rb = handle->rb;
 
-        int wakeup_events = event->attr.wakeup_events;
-
-        if (handle->sample && wakeup_events) {
-                int events = local_inc_return(&rb->events);
-                if (events >= wakeup_events) {
-                        local_sub(wakeup_events, &rb->events);
-                        local_inc(&rb->wakeup);
+        if (handle->sample && !event->attr.watermark) {
+                int wakeup_events = event->attr.wakeup_events;
+
+                if (wakeup_events) {
+                        int events = local_inc_return(&rb->events);
+                        if (events >= wakeup_events) {
+                                local_sub(wakeup_events, &rb->events);
+                                local_inc(&rb->wakeup);
+                        }
                 }
         }