aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace/ring_buffer.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/trace/ring_buffer.c')
-rw-r--r--kernel/trace/ring_buffer.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index b36d7374ceef..aee76b3eeed2 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -1257,7 +1257,6 @@ static DEFINE_PER_CPU(int, rb_need_resched);
1257 * ring_buffer_lock_reserve - reserve a part of the buffer 1257 * ring_buffer_lock_reserve - reserve a part of the buffer
1258 * @buffer: the ring buffer to reserve from 1258 * @buffer: the ring buffer to reserve from
1259 * @length: the length of the data to reserve (excluding event header) 1259 * @length: the length of the data to reserve (excluding event header)
1260 * @flags: a pointer to save the interrupt flags
1261 * 1260 *
1262 * Returns a reseverd event on the ring buffer to copy directly to. 1261 * Returns a reseverd event on the ring buffer to copy directly to.
1263 * The user of this interface will need to get the body to write into 1262 * The user of this interface will need to get the body to write into
@@ -1270,9 +1269,7 @@ static DEFINE_PER_CPU(int, rb_need_resched);
1270 * If NULL is returned, then nothing has been allocated or locked. 1269 * If NULL is returned, then nothing has been allocated or locked.
1271 */ 1270 */
1272struct ring_buffer_event * 1271struct ring_buffer_event *
1273ring_buffer_lock_reserve(struct ring_buffer *buffer, 1272ring_buffer_lock_reserve(struct ring_buffer *buffer, unsigned long length)
1274 unsigned long length,
1275 unsigned long *flags)
1276{ 1273{
1277 struct ring_buffer_per_cpu *cpu_buffer; 1274 struct ring_buffer_per_cpu *cpu_buffer;
1278 struct ring_buffer_event *event; 1275 struct ring_buffer_event *event;
@@ -1339,15 +1336,13 @@ static void rb_commit(struct ring_buffer_per_cpu *cpu_buffer,
1339 * ring_buffer_unlock_commit - commit a reserved 1336 * ring_buffer_unlock_commit - commit a reserved
1340 * @buffer: The buffer to commit to 1337 * @buffer: The buffer to commit to
1341 * @event: The event pointer to commit. 1338 * @event: The event pointer to commit.
1342 * @flags: the interrupt flags received from ring_buffer_lock_reserve.
1343 * 1339 *
1344 * This commits the data to the ring buffer, and releases any locks held. 1340 * This commits the data to the ring buffer, and releases any locks held.
1345 * 1341 *
1346 * Must be paired with ring_buffer_lock_reserve. 1342 * Must be paired with ring_buffer_lock_reserve.
1347 */ 1343 */
1348int ring_buffer_unlock_commit(struct ring_buffer *buffer, 1344int ring_buffer_unlock_commit(struct ring_buffer *buffer,
1349 struct ring_buffer_event *event, 1345 struct ring_buffer_event *event)
1350 unsigned long flags)
1351{ 1346{
1352 struct ring_buffer_per_cpu *cpu_buffer; 1347 struct ring_buffer_per_cpu *cpu_buffer;
1353 int cpu = raw_smp_processor_id(); 1348 int cpu = raw_smp_processor_id();