lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'clksrc' into devel

Browse Source 
Conflicts:
	arch/arm/mach-vexpress/v2m.c
	arch/arm/plat-omap/counter_32k.c
	arch/arm/plat-versatile/Makefile
This commit is contained in:
Russell King
2011-01-05 18:09:03 +00:00
parent aa312be198 0af85dda39
commit 58daf18cdc
55 changed files with 3186 additions and 2857 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/include/asm/system.h
View File

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