diff options
author | Ingo Molnar | 2010-04-02 19:37:50 +0200 |
---|---|---|
committer | Ingo Molnar | 2010-04-02 19:38:10 +0200 |
commit | ec5e61aabeac58670691bd0613388d16697d0d81 (patch) | |
tree | 59838509358f27334874b90756505785cde29b02 /include/linux/clockchips.h | |
parent | perf probe: Fix to close dwarf when failing to analyze it (diff) | |
parent | perf: Fix 'perf sched record' deadlock (diff) | |
download | kernel-qcow2-linux-ec5e61aabeac58670691bd0613388d16697d0d81.tar.gz kernel-qcow2-linux-ec5e61aabeac58670691bd0613388d16697d0d81.tar.xz kernel-qcow2-linux-ec5e61aabeac58670691bd0613388d16697d0d81.zip |
Merge branch 'perf/urgent' into perf/core
Conflicts:
arch/x86/kernel/cpu/perf_event.c
Merge reason: Resolve the conflict, pick up fixes
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/clockchips.h')
-rw-r--r-- | include/linux/clockchips.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/clockchips.h b/include/linux/clockchips.h index 0cf725bdd2a1..fc53492b6ad7 100644 --- a/include/linux/clockchips.h +++ b/include/linux/clockchips.h @@ -73,6 +73,7 @@ enum clock_event_nofitiers { * @list: list head for the management code * @mode: operating mode assigned by the management code * @next_event: local storage for the next event in oneshot mode + * @retries: number of forced programming retries */ struct clock_event_device { const char *name; @@ -93,6 +94,7 @@ struct clock_event_device { struct list_head list; enum clock_event_mode mode; ktime_t next_event; + unsigned long retries; }; /* |