git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'batman-adv/next' of git://git.open-mesh.org/linux-merge
[pandora-kernel.git]
/
arch
/
x86
/
oprofile
/
init.c
diff --git
a/arch/x86/oprofile/init.c
b/arch/x86/oprofile/init.c
index
5341d48
..
cdfe4c5
100644
(file)
--- a/
arch/x86/oprofile/init.c
+++ b/
arch/x86/oprofile/init.c
@@
-10,18
+10,19
@@
#include <linux/oprofile.h>
#include <linux/init.h>
#include <linux/errno.h>
#include <linux/oprofile.h>
#include <linux/init.h>
#include <linux/errno.h>
-
-/* We support CPUs that have performance counters like the Pentium Pro
+
+/*
+ * We support CPUs that have performance counters like the Pentium Pro
* with the NMI mode driver.
*/
* with the NMI mode driver.
*/
-
-extern int op_nmi_init(struct oprofile_operations *
ops);
-extern int op_nmi_timer_init(struct oprofile_operations *
ops);
+
+extern int op_nmi_init(struct oprofile_operations *ops);
+extern int op_nmi_timer_init(struct oprofile_operations *ops);
extern void op_nmi_exit(void);
extern void x86_backtrace(struct pt_regs * const regs, unsigned int depth);
extern void op_nmi_exit(void);
extern void x86_backtrace(struct pt_regs * const regs, unsigned int depth);
-int __init oprofile_arch_init(struct oprofile_operations *
ops)
+int __init oprofile_arch_init(struct oprofile_operations *ops)
{
int ret;
{
int ret;