diff options
| author | Jamie Iles <jamie@jamieiles.com> | 2011-10-08 12:20:42 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-17 10:02:44 +0200 |
| commit | 5a567d78c437e3be1c512734cdfe64b4ae6b82d7 (patch) | |
| tree | 5d3afefe2b64fb4d53cbf1ee460f39037d83b76b /arch/arm/kernel/irq.c | |
| parent | ARM: 7124/1: smp: Add a localtimer handler callable from C code (diff) | |
| download | linux-5a567d78c437e3be1c512734cdfe64b4ae6b82d7.tar.xz linux-5a567d78c437e3be1c512734cdfe64b4ae6b82d7.zip | |
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/irq.c')
| -rw-r--r-- | arch/arm/kernel/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c index de3dcab8610b..53919b230e8b 100644 --- a/arch/arm/kernel/irq.c +++ b/arch/arm/kernel/irq.c @@ -35,8 +35,8 @@ #include <linux/list.h> #include <linux/kallsyms.h> #include <linux/proc_fs.h> -#include <linux/ftrace.h> +#include <asm/exception.h> #include <asm/system.h> #include <asm/mach/arch.h> #include <asm/mach/irq.h> |