git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
arch
/
ia64
/
oprofile
/
init.c
diff --git
a/arch/ia64/oprofile/init.c
b/arch/ia64/oprofile/init.c
index
558561d
..
6d0c132
100644
(file)
--- a/
arch/ia64/oprofile/init.c
+++ b/
arch/ia64/oprofile/init.c
@@
-12,14
+12,21
@@
#include <linux/init.h>
#include <linux/errno.h>
#include <linux/init.h>
#include <linux/errno.h>
-extern void timer_init(struct oprofile_operations ** ops);
+extern int perfmon_init(struct oprofile_operations ** ops);
+extern void perfmon_exit(void);
int __init oprofile_arch_init(struct oprofile_operations ** ops)
{
int __init oprofile_arch_init(struct oprofile_operations ** ops)
{
+#ifdef CONFIG_PERFMON
+ return perfmon_init(ops);
+#endif
return -ENODEV;
}
void oprofile_arch_exit(void)
{
return -ENODEV;
}
void oprofile_arch_exit(void)
{
+#ifdef CONFIG_PERFMON
+ perfmon_exit();
+#endif
}
}