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
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
drivers
/
parisc
/
power.c
diff --git
a/drivers/parisc/power.c
b/drivers/parisc/power.c
index
54b2b7f
..
97e9dc0
100644
(file)
--- a/
drivers/parisc/power.c
+++ b/
drivers/parisc/power.c
@@
-1,5
+1,5
@@
/*
/*
- * linux/
arch/parisc/kernel
/power.c
+ * linux/
drivers/parisc
/power.c
* HP PARISC soft power switch support driver
*
* Copyright (c) 2001-2005 Helge Deller <deller@gmx.de>
* HP PARISC soft power switch support driver
*
* Copyright (c) 2001-2005 Helge Deller <deller@gmx.de>
@@
-35,7
+35,6
@@
* runtime through the "/proc/sys/kernel/power" procfs entry.
*/
* runtime through the "/proc/sys/kernel/power" procfs entry.
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/kernel.h>
@@
-85,8
+84,7
@@
static void deferred_poweroff(void *dummy)
{
static void deferred_poweroff(void *dummy)
{
- extern int cad_pid; /* from kernel/sys.c */
- if (kill_proc(cad_pid, SIGINT, 1)) {
+ if (kill_cad_pid(SIGINT, 1)) {
/* just in case killing init process failed */
machine_power_off();
}
/* just in case killing init process failed */
machine_power_off();
}
@@
-190,7
+188,7
@@
static void polling_tasklet_func(unsigned long soft_power_reg)
* powerfail interruption handler (irq IRQ_FROM_REGION(CPU_IRQ_REGION)+2)
*/
#if 0
* powerfail interruption handler (irq IRQ_FROM_REGION(CPU_IRQ_REGION)+2)
*/
#if 0
-static void powerfail_interrupt(int code, void *x
, struct pt_regs *regs
)
+static void powerfail_interrupt(int code, void *x)
{
printk(KERN_CRIT "POWERFAIL INTERRUPTION !\n");
poweroff();
{
printk(KERN_CRIT "POWERFAIL INTERRUPTION !\n");
poweroff();
@@
-251,7
+249,8
@@
static int __init power_init(void)
}
/* Register a call for panic conditions. */
}
/* Register a call for panic conditions. */
- notifier_chain_register(&panic_notifier_list, &parisc_panic_block);
+ atomic_notifier_chain_register(&panic_notifier_list,
+ &parisc_panic_block);
tasklet_enable(&power_tasklet);
tasklet_enable(&power_tasklet);
@@
-264,7
+263,8
@@
static void __exit power_exit(void)
return;
tasklet_disable(&power_tasklet);
return;
tasklet_disable(&power_tasklet);
- notifier_chain_unregister(&panic_notifier_list, &parisc_panic_block);
+ atomic_notifier_chain_unregister(&panic_notifier_list,
+ &parisc_panic_block);
power_tasklet.func = NULL;
pdc_soft_power_button(0);
}
power_tasklet.func = NULL;
pdc_soft_power_button(0);
}