diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-09-09 20:40:06 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-09-09 20:40:08 +0200 |
commit | 2aa61274efb9f532deaebc9812675a27af1994cb (patch) | |
tree | c2f70525dc152e0ddce60f1a3021473cc6a3f298 /drivers/oprofile/cpu_buffer.c | |
parent | perf: Add a script to show packets processing (diff) | |
parent | perf: Fix CPU hotplug (diff) | |
download | linux-dev-2aa61274efb9f532deaebc9812675a27af1994cb.tar.xz linux-dev-2aa61274efb9f532deaebc9812675a27af1994cb.zip |
Merge branch 'perf/urgent' into perf/core
Merge reason: Pick up pending fixes before applying dependent new changes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/oprofile/cpu_buffer.c')
-rw-r--r-- | drivers/oprofile/cpu_buffer.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/oprofile/cpu_buffer.c b/drivers/oprofile/cpu_buffer.c index 219f79e2210a..f179ac2ea801 100644 --- a/drivers/oprofile/cpu_buffer.c +++ b/drivers/oprofile/cpu_buffer.c @@ -120,8 +120,6 @@ void end_cpu_work(void) cancel_delayed_work(&b->work); } - - flush_scheduled_work(); } /* |