leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'misc' into devel

Browse Source 
Conflicts:
	arch/arm/Kconfig
This commit is contained in:
Russell King
2011-03-16 23:35:25 +00:00
parent 2472f3c8d8 10a8c38398
commit 1f0090a1ea
38 changed files with 462 additions and 792 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
arch/arm/include/asm/processor.h
View File

@@ -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