summaryrefslogtreecommitdiff
path: root/kernel/profile.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2007-01-24 02:14:25 -0500
committerJeff Garzik <jeff@garzik.org>2007-01-24 02:14:25 -0500
commite47b207a5bcb73bb097f94d9fe364f50737b0eb2 (patch)
tree57389653c37d001de3a90655cb4172ba29199ce4 /kernel/profile.c
parentd344bff9c36db17dc4765215495aaa7212c1eb6c (diff)
parent419dd8378dfa32985672ab7927b4bc827f33b332 (diff)
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'kernel/profile.c')
-rw-r--r--kernel/profile.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/profile.c b/kernel/profile.c
index a6574a18514e..d6579d511069 100644
--- a/kernel/profile.c
+++ b/kernel/profile.c
@@ -331,7 +331,6 @@ out:
local_irq_restore(flags);
put_cpu();
}
-EXPORT_SYMBOL_GPL(profile_hits);
static int __devinit profile_cpu_callback(struct notifier_block *info,
unsigned long action, void *__cpu)
@@ -401,6 +400,8 @@ void profile_hits(int type, void *__pc, unsigned int nr_hits)
}
#endif /* !CONFIG_SMP */
+EXPORT_SYMBOL_GPL(profile_hits);
+
void profile_tick(int type)
{
struct pt_regs *regs = get_irq_regs();