diff options
author | Russell King | 2011-03-17 00:35:25 +0100 |
---|---|---|
committer | Russell King | 2011-03-17 00:35:25 +0100 |
commit | 1f0090a1eaa1b750a2fc5c99c91b790d5322a1fd (patch) | |
tree | c685060f260410e6704c9dfd457ed8c347141f1d /arch/arm/include/asm/processor.h | |
parent | Merge branches 'at91', 'ep93xx', 'errata', 'footbridge', 'fncpy', 'gemini', '... (diff) | |
parent | ARM: 6806/1: irq: introduce entry and exit functions for chained handlers (diff) | |
download | kernel-qcow2-linux-1f0090a1eaa1b750a2fc5c99c91b790d5322a1fd.tar.gz kernel-qcow2-linux-1f0090a1eaa1b750a2fc5c99c91b790d5322a1fd.tar.xz kernel-qcow2-linux-1f0090a1eaa1b750a2fc5c99c91b790d5322a1fd.zip |
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 |