diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/oprofile/cpu_buffer.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/oprofile/cpu_buffer.h')
| -rw-r--r-- | drivers/oprofile/cpu_buffer.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/oprofile/cpu_buffer.h b/drivers/oprofile/cpu_buffer.h index 68ea16ab645f..e1d097e250ae 100644 --- a/drivers/oprofile/cpu_buffer.h +++ b/drivers/oprofile/cpu_buffer.h | |||
| @@ -25,6 +25,7 @@ void free_cpu_buffers(void); | |||
| 25 | 25 | ||
| 26 | void start_cpu_work(void); | 26 | void start_cpu_work(void); |
| 27 | void end_cpu_work(void); | 27 | void end_cpu_work(void); |
| 28 | void flush_cpu_work(void); | ||
| 28 | 29 | ||
| 29 | /* CPU buffer is composed of such entries (which are | 30 | /* CPU buffer is composed of such entries (which are |
| 30 | * also used for context switch notes) | 31 | * also used for context switch notes) |