diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-09-12 07:02:26 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-12 07:02:26 -0400 |
| commit | ddd559b13f6d2fe3ad68c4b3f5235fd3c2eae4e3 (patch) | |
| tree | d827bca3fc825a0ac33efbcd493713be40fcc812 /arch/arm/kernel/armksyms.c | |
| parent | cf7a2b4fb6a9b86779930a0a123b0df41aa9208f (diff) | |
| parent | f17a1f06d2fa93f4825be572622eb02c4894db4e (diff) | |
Merge branch 'devel-stable' into devel
Conflicts:
MAINTAINERS
arch/arm/mm/fault.c
Diffstat (limited to 'arch/arm/kernel/armksyms.c')
| -rw-r--r-- | arch/arm/kernel/armksyms.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c index 531e1860e546..0e627705f746 100644 --- a/arch/arm/kernel/armksyms.c +++ b/arch/arm/kernel/armksyms.c | |||
| @@ -186,4 +186,5 @@ EXPORT_SYMBOL(_find_next_bit_be); | |||
| 186 | 186 | ||
| 187 | #ifdef CONFIG_FUNCTION_TRACER | 187 | #ifdef CONFIG_FUNCTION_TRACER |
| 188 | EXPORT_SYMBOL(mcount); | 188 | EXPORT_SYMBOL(mcount); |
| 189 | EXPORT_SYMBOL(__gnu_mcount_nc); | ||
| 189 | #endif | 190 | #endif |