diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-17 02:35:25 +0300 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-17 02:35:25 +0300 |
| commit | 1f0090a1eaa1b750a2fc5c99c91b790d5322a1fd (patch) | |
| tree | c685060f260410e6704c9dfd457ed8c347141f1d /arch/arm/include/asm/processor.h | |
| parent | 2472f3c8d8fc18b25b2cf1574c036e238187c0ff (diff) | |
| parent | 10a8c3839810ac9af1aec836d61b92e7a879f5fa (diff) | |
| download | linux-1f0090a1eaa1b750a2fc5c99c91b790d5322a1fd.tar.xz | |
Merge branch 'misc' into devel
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'arch/arm/include/asm/processor.h')
| -rw-r--r-- | arch/arm/include/asm/processor.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/arm/include/asm/processor.h b/arch/arm/include/asm/processor.h index 7a1f03c10f1b..b2d9df5667af 100644 --- a/arch/arm/include/asm/processor.h +++ b/arch/arm/include/asm/processor.h @@ -29,19 +29,7 @@ #define STACK_TOP_MAX TASK_SIZE #endif -union debug_insn { - u32 arm; - u16 thumb; -}; - -struct debug_entry { - u32 address; - union debug_insn insn; -}; - struct debug_info { - int nsaved; - struct debug_entry bp[2]; #ifdef CONFIG_HAVE_HW_BREAKPOINT struct perf_event *hbp[ARM_MAX_HBP_SLOTS]; #endif |