diff options
| author | Russell King | 2011-01-06 23:32:52 +0100 |
|---|---|---|
| committer | Russell King | 2011-01-06 23:32:52 +0100 |
| commit | 4073723acb9cdcdbe4df9c0e0c376c65d1697e43 (patch) | |
| tree | f41c17eac157b1223ce104845cf9b1e5a9e6a83d /arch/arm/include/asm/traps.h | |
| parent | Merge branch 'clksrc' into devel (diff) | |
| parent | Merge branch 'smp' into misc (diff) | |
| download | kernel-qcow2-linux-4073723acb9cdcdbe4df9c0e0c376c65d1697e43.tar.gz kernel-qcow2-linux-4073723acb9cdcdbe4df9c0e0c376c65d1697e43.tar.xz kernel-qcow2-linux-4073723acb9cdcdbe4df9c0e0c376c65d1697e43.zip | |
Merge branch 'misc' into devel
Conflicts:
arch/arm/Kconfig
arch/arm/common/Makefile
arch/arm/kernel/Makefile
arch/arm/kernel/smp.c
Diffstat (limited to 'arch/arm/include/asm/traps.h')
| -rw-r--r-- | arch/arm/include/asm/traps.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/include/asm/traps.h b/arch/arm/include/asm/traps.h index 124475afb007..1b960d5ef6a5 100644 --- a/arch/arm/include/asm/traps.h +++ b/arch/arm/include/asm/traps.h @@ -46,4 +46,6 @@ static inline int in_exception_text(unsigned long ptr) extern void __init early_trap_init(void); extern void dump_backtrace_entry(unsigned long where, unsigned long from, unsigned long frame); +extern void *vectors_page; + #endif |