diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-02-22 14:51:53 -0500 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-02-22 14:51:53 -0500 |
| commit | a6065b3dd8fa22efcedaf65517f4ec47ba25661d (patch) | |
| tree | f3aead47130b9fbe9fae7c88048f4963daba6463 /arch/arm/include/asm/processor.h | |
| parent | 1eb42c73ca0a3692fb928e9f125cf84544ad5f12 (diff) | |
| parent | d8d3f25e6a3b7abb37d569b0e36adc069b190a3a (diff) | |
Merge commit 'd8d3f25' (misc branch) into linaro-2.6.38
Conflicts:
arch/arm/kernel/head.S
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 67357baaeee..b439b41aeac 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 |