summaryrefslogtreecommitdiff
path: root/arch/arm/kernel/traps.c
diff options
context:
space:
mode:
authorJamie Iles <jamie@jamieiles.com>2011-10-08 11:20:42 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-10-17 09:02:44 +0100
commit5a567d78c437e3be1c512734cdfe64b4ae6b82d7 (patch)
tree5d3afefe2b64fb4d53cbf1ee460f39037d83b76b /arch/arm/kernel/traps.c
parent0af8aa0069e43f90d59666510342c05e97d8c4b8 (diff)
ARM: 7115/4: move __exception and friends to asm/exception.h
The definition of __exception_irq_entry for CONFIG_FUNCTION_GRAPH_TRACER=y needs linux/ftrace.h, but this creates a circular dependency with it's current home in asm/system.h. Create asm/exception.h and update all current users. v4: - rebase to rmk/for-next v3: - remove redundant includes of linux/ftrace.h v2: - document the usage restricitions of __exception* Cc: Zoltan Devai <zdevai@gmail.com> Signed-off-by: Jamie Iles <jamie@jamieiles.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/traps.c')
-rw-r--r--arch/arm/kernel/traps.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index bc9f9da782cb..210382555af1 100644
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -27,6 +27,7 @@
#include <linux/atomic.h>
#include <asm/cacheflush.h>
+#include <asm/exception.h>
#include <asm/system.h>
#include <asm/unistd.h>
#include <asm/traps.h>