diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-09-01 16:31:07 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-09-01 16:31:07 -0400 |
| commit | b4c69d45c4c0d7480e9df183ebda62148984af25 (patch) | |
| tree | b93b7a249779fdde22bc6639ad878335afaaf4c0 /drivers/oprofile/cpu_buffer.c | |
| parent | 68d3f1d810500e8b975bdf0b20dd83d060076b4b (diff) | |
| parent | 269f45c25028c75fe10e6d9be86e7202ab461fbc (diff) | |
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/urgent
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) | |||
| 120 | 120 | ||
| 121 | cancel_delayed_work(&b->work); | 121 | cancel_delayed_work(&b->work); |
| 122 | } | 122 | } |
| 123 | |||
| 124 | flush_scheduled_work(); | ||
| 125 | } | 123 | } |
| 126 | 124 | ||
| 127 | /* | 125 | /* |