projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] wext: Fix RtNetlink ENCODE security permissions
[powerpc.git]
/
arch
/
i386
/
kernel
/
apm.c
diff --git
a/arch/i386/kernel/apm.c
b/arch/i386/kernel/apm.c
index
2d793d4
..
df0e174
100644
(file)
--- a/
arch/i386/kernel/apm.c
+++ b/
arch/i386/kernel/apm.c
@@
-219,6
+219,7
@@
#include <linux/sched.h>
#include <linux/pm.h>
#include <linux/pm_legacy.h>
#include <linux/sched.h>
#include <linux/pm.h>
#include <linux/pm_legacy.h>
+#include <linux/capability.h>
#include <linux/device.h>
#include <linux/kernel.h>
#include <linux/smp.h>
#include <linux/device.h>
#include <linux/kernel.h>
#include <linux/smp.h>
@@
-823,8
+824,6
@@
static void apm_do_busy(void)
static void (*original_pm_idle)(void);
static void (*original_pm_idle)(void);
-extern void default_idle(void);
-
/**
* apm_cpu_idle - cpu idling for APM capable Linux
*
/**
* apm_cpu_idle - cpu idling for APM capable Linux
*
@@
-1080,7
+1079,7
@@
static int apm_console_blank(int blank)
break;
}
break;
}
- if (error == APM_NOT_ENGAGED
&& state != APM_STATE_READY
) {
+ if (error == APM_NOT_ENGAGED) {
static int tried;
int eng_error;
if (tried++ == 0) {
static int tried;
int eng_error;
if (tried++ == 0) {
@@
-2291,7
+2290,9
@@
static int __init apm_init(void)
apm_info.disabled = 1;
return -ENODEV;
}
apm_info.disabled = 1;
return -ENODEV;
}
+#ifdef CONFIG_PM_LEGACY
pm_active = 1;
pm_active = 1;
+#endif
/*
* Set up a segment that references the real mode segment 0x40
/*
* Set up a segment that references the real mode segment 0x40
@@
-2382,7
+2383,9
@@
static void __exit apm_exit(void)
exit_kapmd = 1;
while (kapmd_running)
schedule();
exit_kapmd = 1;
while (kapmd_running)
schedule();
+#ifdef CONFIG_PM_LEGACY
pm_active = 0;
pm_active = 0;
+#endif
}
module_init(apm_init);
}
module_init(apm_init);