diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2011-01-04 09:43:42 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-01-04 09:43:42 +0100 |
| commit | bc030d6cb9532877c1c5a3f5e7123344fa24a285 (patch) | |
| tree | d223d410b868b80d4c0deec192d354a5d06b201a /tools/perf/scripts/python/bin/netdev-times-record | |
| parent | x86, acpi: Parse all SRAT cpu entries even above the cpu number limitation (diff) | |
| parent | Linux 2.6.37-rc8 (diff) | |
| download | linux-dev-bc030d6cb9532877c1c5a3f5e7123344fa24a285.tar.xz linux-dev-bc030d6cb9532877c1c5a3f5e7123344fa24a285.zip | |
Merge commit 'v2.6.37-rc8' into x86/apic
Conflicts:
arch/x86/include/asm/io_apic.h
Merge reason: move to a fresh -rc, resolve the conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/scripts/python/bin/netdev-times-record')
| -rw-r--r-- | tools/perf/scripts/python/bin/netdev-times-record | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/scripts/python/bin/netdev-times-record b/tools/perf/scripts/python/bin/netdev-times-record index d931a828126b..558754b840a9 100644 --- a/tools/perf/scripts/python/bin/netdev-times-record +++ b/tools/perf/scripts/python/bin/netdev-times-record @@ -1,5 +1,5 @@ #!/bin/bash -perf record -a -e net:net_dev_xmit -e net:net_dev_queue \ +perf record -e net:net_dev_xmit -e net:net_dev_queue \ -e net:netif_receive_skb -e net:netif_rx \ -e skb:consume_skb -e skb:kfree_skb \ -e skb:skb_copy_datagram_iovec -e napi:napi_poll \ |