forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'tracing/urgent' into tracing/ftrace

Browse source 
Conflicts:
	kernel/trace/trace.c
This commit is contained in:
Ingo Molnar 2008-11-11 09:40:18 +01:00
commit e0cb4ebcd9
228 changed files with 4407 additions and 1462 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kernel/trace/ring_buffer.c
View file

@ -1065,7 +1065,7 @@ rb_reserve_next_event(struct ring_buffer_per_cpu *cpu_buffer,
/* Did the write stamp get updated already? */
if (unlikely(ts < cpu_buffer->write_stamp))
goto again;
delta = 0;
if (test_time_stamp(delta)) {