diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-24 09:06:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-24 09:06:47 -0700 |
| commit | c61264f98c1a974ee6f545f61a4ab33b141d6bda (patch) | |
| tree | 490e82c3bbf1403098b582f589eec378be727d4c /net/rose/rose_timer.c | |
| parent | a23a334bd547e9462d9ca4a74608519a1e928848 (diff) | |
| parent | bd9ddc875b6659f9f74dcfd285c472bc58041abd (diff) | |
| download | linux-c61264f98c1a974ee6f545f61a4ab33b141d6bda.tar.gz linux-c61264f98c1a974ee6f545f61a4ab33b141d6bda.tar.bz2 linux-c61264f98c1a974ee6f545f61a4ab33b141d6bda.zip | |
Merge branch 'upstream/xen-tracing2' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen
* 'upstream/xen-tracing2' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:
xen/trace: use class for multicall trace
xen/trace: convert mmu events to use DECLARE_EVENT_CLASS()/DEFINE_EVENT()
xen/multicall: move *idx fields to start of mc_buffer
xen/multicall: special-case singleton hypercalls
xen/multicalls: add unlikely around slowpath in __xen_mc_entry()
xen/multicalls: disable MC_DEBUG
xen/mmu: tune pgtable alloc/release
xen/mmu: use extend_args for more mmuext updates
xen/trace: add tlb flush tracepoints
xen/trace: add segment desc tracing
xen/trace: add xen_pgd_(un)pin tracepoints
xen/trace: add ptpage alloc/release tracepoints
xen/trace: add mmu tracepoints
xen/trace: add multicall tracing
xen/trace: set up tracepoint skeleton
xen/multicalls: remove debugfs stats
trace/xen: add skeleton for Xen trace events
Diffstat (limited to 'net/rose/rose_timer.c')
0 files changed, 0 insertions, 0 deletions