diff options
| author | Russell King | 2010-11-26 11:28:11 +0100 |
|---|---|---|
| committer | Russell King | 2010-11-26 11:28:11 +0100 |
| commit | 83cf1eecfe9afee99d6b86f963187acd414c019d (patch) | |
| tree | 4381bdcc45d81c8c3713630cae9660d770885d96 /arch/arm/include | |
| parent | Merge branch 'perf-split' of git://linux-arm.org/linux-2.6-wd into devel-stable (diff) | |
| parent | ARM: ftrace: enable function graph tracer (diff) | |
| download | kernel-qcow2-linux-83cf1eecfe9afee99d6b86f963187acd414c019d.tar.gz kernel-qcow2-linux-83cf1eecfe9afee99d6b86f963187acd414c019d.tar.xz kernel-qcow2-linux-83cf1eecfe9afee99d6b86f963187acd414c019d.zip | |
Merge branch 'ftrace' of git://github.com/rabinv/linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/system.h | 5 | ||||
| -rw-r--r-- | arch/arm/include/asm/traps.h | 23 |
2 files changed, 26 insertions, 2 deletions
diff --git a/arch/arm/include/asm/system.h b/arch/arm/include/asm/system.h index 1120f18a6b17..ec4327a4653d 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; diff --git a/arch/arm/include/asm/traps.h b/arch/arm/include/asm/traps.h index 491960bf4260..124475afb007 100644 --- a/arch/arm/include/asm/traps.h +++ b/arch/arm/include/asm/traps.h @@ -15,13 +15,32 @@ struct undef_hook { void register_undef_hook(struct undef_hook *hook); void unregister_undef_hook(struct undef_hook *hook); +#ifdef CONFIG_FUNCTION_GRAPH_TRACER +static inline int __in_irqentry_text(unsigned long ptr) +{ + extern char __irqentry_text_start[]; + extern char __irqentry_text_end[]; + + return ptr >= (unsigned long)&__irqentry_text_start && + ptr < (unsigned long)&__irqentry_text_end; +} +#else +static inline int __in_irqentry_text(unsigned long ptr) +{ + return 0; +} +#endif + static inline int in_exception_text(unsigned long ptr) { extern char __exception_text_start[]; extern char __exception_text_end[]; + int in; + + in = ptr >= (unsigned long)&__exception_text_start && + ptr < (unsigned long)&__exception_text_end; - return ptr >= (unsigned long)&__exception_text_start && - ptr < (unsigned long)&__exception_text_end; + return in ? : __in_irqentry_text(ptr); } extern void __init early_trap_init(void); |