diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-11-26 10:28:11 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-11-26 10:28:11 +0000 |
| commit | 83cf1eecfe9afee99d6b86f963187acd414c019d (patch) | |
| tree | 4381bdcc45d81c8c3713630cae9660d770885d96 /arch/arm/include/asm/traps.h | |
| parent | f1690d17d2c7afa2a2079e3c91eb2bca8c1c5ecd (diff) | |
| parent | 0e341af835fdf553820a1fa98341b93ab32ce466 (diff) | |
| download | talos-op-linux-83cf1eecfe9afee99d6b86f963187acd414c019d.tar.gz talos-op-linux-83cf1eecfe9afee99d6b86f963187acd414c019d.zip | |
Merge branch 'ftrace' of git://github.com/rabinv/linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/include/asm/traps.h')
| -rw-r--r-- | arch/arm/include/asm/traps.h | 23 |
1 files changed, 21 insertions, 2 deletions
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); |
