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 2.0 rc7
[linux-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
3492d96
..
255e470
100644
(file)
--- a/
arch/i386/oprofile/nmi_int.c
+++ b/
arch/i386/oprofile/nmi_int.c
@@
-32,7
+32,7
@@
static int nmi_enabled = 0;
#ifdef CONFIG_PM
-static int nmi_suspend(struct sys_device *dev,
u32
state)
+static int nmi_suspend(struct sys_device *dev,
pm_message_t
state)
{
if (nmi_enabled == 1)
nmi_stop();