diff options
| author | Russell King | 2010-12-18 15:27:55 +0100 |
|---|---|---|
| committer | Russell King | 2010-12-18 15:27:55 +0100 |
| commit | 2f841ed13b9f10037e25ddf417d01700ecd886d0 (patch) | |
| tree | 123448d98b3be03ac90fbb6e32f224235063c8bf /arch/arm/include | |
| parent | ARM: 6521/1: perf: use raw_spinlock_t for pmu_lock (diff) | |
| parent | ARM: hw_breakpoint: do not fail initcall if monitor mode is disabled (diff) | |
| download | kernel-qcow2-linux-2f841ed13b9f10037e25ddf417d01700ecd886d0.tar.gz kernel-qcow2-linux-2f841ed13b9f10037e25ddf417d01700ecd886d0.tar.xz kernel-qcow2-linux-2f841ed13b9f10037e25ddf417d01700ecd886d0.zip | |
Merge branch 'hw-breakpoint' of git://repo.or.cz/linux-2.6/linux-wd into devel-stable
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/hw_breakpoint.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/include/asm/hw_breakpoint.h b/arch/arm/include/asm/hw_breakpoint.h index 4d8ae9d67abe..f389b2704d82 100644 --- a/arch/arm/include/asm/hw_breakpoint.h +++ b/arch/arm/include/asm/hw_breakpoint.h @@ -20,8 +20,8 @@ struct arch_hw_breakpoint_ctrl { struct arch_hw_breakpoint { u32 address; u32 trigger; - struct perf_event *suspended_wp; - struct arch_hw_breakpoint_ctrl ctrl; + struct arch_hw_breakpoint_ctrl step_ctrl; + struct arch_hw_breakpoint_ctrl ctrl; }; static inline u32 encode_ctrl_reg(struct arch_hw_breakpoint_ctrl ctrl) |