linux/include/trace/events
Linus Torvalds 2f9e825d3e Merge branch 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block
* 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block: (149 commits)
  block: make sure that REQ_* types are seen even with CONFIG_BLOCK=n
  xen-blkfront: fix missing out label
  blkdev: fix blkdev_issue_zeroout return value
  block: update request stacking methods to support discards
  block: fix missing export of blk_types.h
  writeback: fix bad _bh spinlock nesting
  drbd: revert "delay probes", feature is being re-implemented differently
  drbd: Initialize all members of sync_conf to their defaults [Bugz 315]
  drbd: Disable delay probes for the upcomming release
  writeback: cleanup bdi_register
  writeback: add new tracepoints
  writeback: remove unnecessary init_timer call
  writeback: optimize periodic bdi thread wakeups
  writeback: prevent unnecessary bdi threads wakeups
  writeback: move bdi threads exiting logic to the forker thread
  writeback: restructure bdi forker loop a little
  writeback: move last_active to bdi
  writeback: do not remove bdi from bdi_list
  writeback: simplify bdi code a little
  writeback: do not lose wake-ups in bdi threads
  ...

Fixed up pretty trivial conflicts in drivers/block/virtio_blk.c and
drivers/scsi/scsi_error.c as per Jens.
2010-08-10 15:22:42 -07:00
..
bkl.h events: Harmonize event field names and print output names 2009-10-15 12:42:03 +02:00
block.h block: remove wrappers for request type/flags 2010-08-07 18:17:56 +02:00
ext4.h ext4: fix potential NULL dereference while tracing 2010-07-27 11:56:04 -04:00
gfpflags.h vmscan: tracing: add trace events for kswapd wakeup, sleeping and direct reclaim 2010-08-09 20:44:59 -07:00
irq.h tracing: Convert softirq events to DEFINE_EVENT 2009-11-26 09:14:03 +01:00
jbd2.h ext4: Add new tracepoint for jbd2_cleanup_journal_tail 2009-12-23 07:45:44 -05:00
kmem.h vmscan: tracing: add trace events for kswapd wakeup, sleeping and direct reclaim 2010-08-09 20:44:59 -07:00
kvm.h KVM: cleanup kvm trace 2010-05-17 12:15:22 +03:00
lock.h tracing: Factorize lock events in a lock class 2010-05-09 13:45:35 +02:00
mce.h perf_event, x86, mce: Use TRACE_EVENT() for MCE logging 2009-10-13 09:43:38 +02:00
module.h Merge branch 'linus' into tracing/core 2010-04-08 10:18:47 +02:00
napi.h tracing: Fix tracepoint.h DECLARE_TRACE() to allow more than one header 2010-05-05 11:46:17 -04:00
power.h x86 cpufreq, perf: Make trace_power_frequency cpufreq driver independent 2010-07-22 12:08:27 +02:00
sched.h tracing: Convert more sched events to DEFINE_EVENT 2010-06-28 17:12:50 -04:00
scsi.h [SCSI] scsi_trace: Enhance SCSI command tracing 2010-04-30 12:52:08 -05:00
signal.h tracing: Fix null pointer deref with SEND_SIG_FORCED 2010-06-08 23:51:32 +02:00
skb.h net: skb ftracer - add tracepoint to skb_copy_datagram_iovec (v3) 2009-08-13 16:26:14 -07:00
syscalls.h tracing: Separate raw syscall from syscall tracer 2009-11-25 14:20:06 -05:00
timer.h tracing: Convert some timer events to DEFINE_EVENT 2010-06-28 17:12:48 -04:00
vmscan.h memcg: add mm_vmscan_memcg_isolate tracepoint 2010-08-09 20:45:03 -07:00
writeback.h writeback: add new tracepoints 2010-08-07 18:53:56 +02:00