android_kernel_xiaomi_sm8350/drivers/oprofile
Linus Torvalds 714f83d5d9 Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (413 commits)
  tracing, net: fix net tree and tracing tree merge interaction
  tracing, powerpc: fix powerpc tree and tracing tree interaction
  ring-buffer: do not remove reader page from list on ring buffer free
  function-graph: allow unregistering twice
  trace: make argument 'mem' of trace_seq_putmem() const
  tracing: add missing 'extern' keywords to trace_output.h
  tracing: provide trace_seq_reserve()
  blktrace: print out BLK_TN_MESSAGE properly
  blktrace: extract duplidate code
  blktrace: fix memory leak when freeing struct blk_io_trace
  blktrace: fix blk_probes_ref chaos
  blktrace: make classic output more classic
  blktrace: fix off-by-one bug
  blktrace: fix the original blktrace
  blktrace: fix a race when creating blk_tree_root in debugfs
  blktrace: fix timestamp in binary output
  tracing, Text Edit Lock: cleanup
  tracing: filter fix for TRACE_EVENT_FORMAT events
  ftrace: Using FTRACE_WARN_ON() to check "freed record" in ftrace_release()
  x86: kretprobe-booster interrupt emulation code fix
  ...

Fix up trivial conflicts in
 arch/parisc/include/asm/ftrace.h
 include/linux/memory.h
 kernel/extable.c
 kernel/module.c
2009-04-05 11:04:19 -07:00
..
buffer_sync.c oprofile: Thou shalt not call __exit functions from __init functions 2009-03-30 22:05:18 +10:30
buffer_sync.h cpumask: modifiy oprofile initialization 2009-01-22 14:37:06 +01:00
cpu_buffer.c ring_buffer: remove unused flags parameter, fix 2009-02-06 01:14:05 +01:00
cpu_buffer.h oprofile: fix uninitialized use of struct op_entry 2009-01-17 17:26:39 +01:00
event_buffer.c oprofile: rename kernel-wide identifiers 2008-12-16 17:52:49 +01:00
event_buffer.h Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile 2008-10-23 10:05:40 -07:00
oprof.c cpumask: modifiy oprofile initialization 2009-01-22 14:37:06 +01:00
oprof.h oprofile: rename kernel-wide identifiers 2008-12-16 17:52:49 +01:00
oprofile_files.c oprofile: rename kernel-wide identifiers 2008-12-16 17:52:49 +01:00
oprofile_stats.c oprofile: fixing whitespaces in drivers/oprofile/* 2008-10-16 15:01:40 +02:00
oprofile_stats.h oprofile: fixing whitespaces in drivers/oprofile/* 2008-10-16 15:01:40 +02:00
oprofilefs.c zero i_uid/i_gid on inode allocation 2009-01-05 11:54:28 -05:00
timer_int.c oprofile: fixing whitespaces in drivers/oprofile/* 2008-10-16 15:01:40 +02:00