Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a567d78 authored by Jamie Iles's avatar Jamie Iles Committed by Russell King
Browse files

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: default avatarJamie Iles <jamie@jamieiles.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 0af8aa00

arch/arm/include/asm/exception.h

0 → 100644
+19 −0
Original line number Diff line number Diff line 
/*

 * Annotations for marking C functions as exception handlers.

 *

 * These should only be used for C functions that are called from the low

 * level exception entry code and not any intervening C code.

 */

#ifndef __ASM_ARM_EXCEPTION_H

#define __ASM_ARM_EXCEPTION_H



#include <linux/ftrace.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



#endif /* __ASM_ARM_EXCEPTION_H */

arch/arm/include/asm/system.h

+0 −7
Original line number Diff line number Diff line
@@ -62,13 +62,6 @@ 


#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;

arch/arm/kernel/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -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>

arch/arm/kernel/smp.c

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
#include <linux/cache.h>

#include <linux/profile.h>

#include <linux/errno.h>

#include <linux/ftrace.h>

#include <linux/mm.h>

#include <linux/err.h>

#include <linux/cpu.h>
@@ -31,6 +30,7 @@ 
#include <asm/cacheflush.h>

#include <asm/cpu.h>

#include <asm/cputype.h>

#include <asm/exception.h>

#include <asm/topology.h>

#include <asm/mmu_context.h>

#include <asm/pgtable.h>

arch/arm/kernel/traps.c

+1 −0
Original line number Diff line number Diff line
@@ -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>