diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-10-13 01:18:36 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-10-13 01:18:36 -0400 |
| commit | 4783f393de3077211c14675a0e57c8a02e9190b0 (patch) | |
| tree | 6c37d8664eb072fd026db3706481d771da4495ca /drivers/oprofile/cpu_buffer.c | |
| parent | 9f5f9ffe50e90ed73040d2100db8bfc341cee352 (diff) | |
| parent | 5b8544c38e6fde6968645afd46ff681492192b86 (diff) | |
Merge remote branch 'kumar/merge' into next
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 | /* |