git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[sfrench/cifs-2.6.git]
/
arch
/
i386
/
oprofile
/
nmi_int.c
diff --git
a/arch/i386/oprofile/nmi_int.c
b/arch/i386/oprofile/nmi_int.c
index 255e4702d185e363558c5064751ae7be9f9c20c0..0493e8b8ec49266618b155fb3490f02854dc70db 100644
(file)
--- a/
arch/i386/oprofile/nmi_int.c
+++ b/
arch/i386/oprofile/nmi_int.c
@@
-355,7
+355,7
@@
static int __init ppro_init(char ** cpu_type)
/* in order to get driverfs right */
static int using_nmi;
/* in order to get driverfs right */
static int using_nmi;
-int __init nmi_init(struct oprofile_operations *ops)
+int __init
op_
nmi_init(struct oprofile_operations *ops)
{
__u8 vendor = boot_cpu_data.x86_vendor;
__u8 family = boot_cpu_data.x86;
{
__u8 vendor = boot_cpu_data.x86_vendor;
__u8 family = boot_cpu_data.x86;
@@
-420,7
+420,7
@@
int __init nmi_init(struct oprofile_operations *ops)
}
}
-void nmi_exit(void)
+void
op_
nmi_exit(void)
{
if (using_nmi)
exit_driverfs();
{
if (using_nmi)
exit_driverfs();