diff options
| author | Russell King | 2011-01-05 19:09:03 +0100 |
|---|---|---|
| committer | Russell King | 2011-01-05 19:09:03 +0100 |
| commit | 58daf18cdcab550262a5f4681e1f1e073e21965a (patch) | |
| tree | 2096324b947761a567dd451f33664f17ee1de2cd /arch/arm/include/asm/system.h | |
| parent | Merge branches 'mmci' and 'pl011-dma' into devel (diff) | |
| parent | ARM: vexpress: add sched_clock() for Versatile Express (diff) | |
| download | kernel-qcow2-linux-58daf18cdcab550262a5f4681e1f1e073e21965a.tar.gz kernel-qcow2-linux-58daf18cdcab550262a5f4681e1f1e073e21965a.tar.xz kernel-qcow2-linux-58daf18cdcab550262a5f4681e1f1e073e21965a.zip | |
Merge branch 'clksrc' into devel
Conflicts:
arch/arm/mach-vexpress/v2m.c
arch/arm/plat-omap/counter_32k.c
arch/arm/plat-versatile/Makefile
Diffstat (limited to 'arch/arm/include/asm/system.h')
| -rw-r--r-- | arch/arm/include/asm/system.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/include/asm/system.h b/arch/arm/include/asm/system.h index 80025948b8ad..3222ab8b3447 100644 --- a/arch/arm/include/asm/system.h +++ b/arch/arm/include/asm/system.h @@ -63,6 +63,11 @@ #include <asm/outercache.h> #define __exception __attribute__((section(".exception.text"))) +#ifdef CONFIG_FUNCTION_GRAPH_TRACER +#define __exception_irq_entry __irq_entry +#else +#define __exception_irq_entry __exception +#endif struct thread_info; struct task_struct; |