diff options
| author | Robert Richter <robert.richter@amd.com> | 2010-10-01 08:54:17 +0200 |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2010-10-01 08:54:17 +0200 |
| commit | ef70fcc0cd5d98f5e2df82c9e598b47f351d4f66 (patch) | |
| tree | b801ba4d7ebb1155df68d530df49444ffa6252cc /drivers/oprofile/cpu_buffer.c | |
| parent | oprofile, arm: initialize perf_event pointers with NULL (diff) | |
| parent | oprofile, ARM: Release resources on failure (diff) | |
| download | linux-ef70fcc0cd5d98f5e2df82c9e598b47f351d4f66.tar.xz linux-ef70fcc0cd5d98f5e2df82c9e598b47f351d4f66.zip | |
Merge branch 'oprofile/urgent' into oprofile/core
Conflicts:
arch/arm/oprofile/common.c
Signed-off-by: Robert Richter <robert.richter@amd.com>
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(); } /* |