From 251413ba067c3ca878ee648085fe54d5fc8fb85f Mon Sep 17 00:00:00 2001
From: Kyle McMartin <kyle@parisc-linux.org>
Date: Tue, 17 Jan 2006 22:33:32 -0700
Subject: [PATCH] --- yaml --- r: 19750 b: refs/heads/master c:
 85509c00073d4bdd1f4b7796180a15198f2e62da h: refs/heads/master v: v3

---
 [refs]                             |  2 +-
 trunk/arch/parisc/kernel/process.c | 13 +++++--------
 trunk/drivers/parisc/lasi.c        |  3 ++-
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 1afbca228074..20ae7ad5dae6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 526110f8c8d2326413e2de5496d196ee9d4856ad
+refs/heads/master: 85509c00073d4bdd1f4b7796180a15198f2e62da
diff --git a/trunk/arch/parisc/kernel/process.c b/trunk/arch/parisc/kernel/process.c
index 998700ce4556..e8dea4177113 100644
--- a/trunk/arch/parisc/kernel/process.c
+++ b/trunk/arch/parisc/kernel/process.c
@@ -54,12 +54,6 @@
 #include <asm/uaccess.h>
 #include <asm/unwind.h>
 
-/*
- * Power off function, if any
- */ 
-void (*pm_power_off)(void);
-EXPORT_SYMBOL(pm_power_off);
-
 void default_idle(void)
 {
 	barrier();
@@ -142,6 +136,7 @@ void machine_halt(void)
 	*/
 }
 
+void (*chassis_power_off)(void);
 
 /*
  * This routine is called from sys_reboot to actually turn off the
@@ -150,8 +145,8 @@ void machine_halt(void)
 void machine_power_off(void)
 {
 	/* If there is a registered power off handler, call it. */
-	if(pm_power_off)
-		pm_power_off();
+	if (chassis_power_off)
+		chassis_power_off();
 
 	/* Put the soft power button back under hardware control.
 	 * If the user had already pressed the power button, the
@@ -167,6 +162,8 @@ void machine_power_off(void)
 	       KERN_EMERG "Please power this system off now.");
 }
 
+void (*pm_power_off)(void) = machine_power_off;
+EXPORT_SYMBOL(pm_power_off);
 
 /*
  * Create a kernel thread
diff --git a/trunk/drivers/parisc/lasi.c b/trunk/drivers/parisc/lasi.c
index d043a8a33511..cb3d28176129 100644
--- a/trunk/drivers/parisc/lasi.c
+++ b/trunk/drivers/parisc/lasi.c
@@ -166,6 +166,7 @@ static void lasi_power_off(void)
 int __init
 lasi_init_chip(struct parisc_device *dev)
 {
+	extern void (*chassis_power_off)(void);
 	struct gsc_asic *lasi;
 	struct gsc_irq gsc_irq;
 	int ret;
@@ -222,7 +223,7 @@ lasi_init_chip(struct parisc_device *dev)
 	 * ensure that only the first LASI (the one controlling the power off)
 	 * should set the HPA here */
 	lasi_power_off_hpa = lasi->hpa;
-	pm_power_off = lasi_power_off;
+	chassis_power_off = lasi_power_off;
 	
 	return ret;
 }