Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Kernel bump from 4.1.3-rt to 4.1.7-rt.
[kvmfornfv.git]
/
kernel
/
kernel
/
events
/
ring_buffer.c
diff --git
a/kernel/kernel/events/ring_buffer.c
b/kernel/kernel/events/ring_buffer.c
index
725c416
..
a7604c8
100644
(file)
--- a/
kernel/kernel/events/ring_buffer.c
+++ b/
kernel/kernel/events/ring_buffer.c
@@
-547,11
+547,13
@@
static void __rb_free_aux(struct ring_buffer *rb)
rb->aux_priv = NULL;
}
rb->aux_priv = NULL;
}
- for (pg = 0; pg < rb->aux_nr_pages; pg++)
- rb_free_aux_page(rb, pg);
+ if (rb->aux_nr_pages) {
+ for (pg = 0; pg < rb->aux_nr_pages; pg++)
+ rb_free_aux_page(rb, pg);
- kfree(rb->aux_pages);
- rb->aux_nr_pages = 0;
+ kfree(rb->aux_pages);
+ rb->aux_nr_pages = 0;
+ }
}
void rb_free_aux(struct ring_buffer *rb)
}
void rb_free_aux(struct ring_buffer *rb)