Commit a3761780 authored by David S. Miller's avatar David S. Miller
Browse files

[SPARC64]: Use orderly_poweroff(). 



Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9a79b227

arch/sparc64/kernel/ds.c

+2 −4
Original line number Diff line number Diff line
@@ -13,11 +13,11 @@ 
#include <linux/delay.h>

#include <linux/mutex.h>

#include <linux/kthread.h>

#include <linux/reboot.h>

#include <linux/cpu.h>



#include <asm/ldc.h>

#include <asm/vio.h>

#include <asm/power.h>

#include <asm/mdesc.h>

#include <asm/head.h>

#include <asm/irq.h>
@@ -328,7 +328,7 @@ static void domain_shutdown_data(struct ldc_channel *lp, 


	ds_send(lp, &pkt, sizeof(pkt));



	wake_up_powerd();

	orderly_poweroff(true);

}



struct ds_panic_req {
@@ -1133,8 +1133,6 @@ static int __devinit ds_probe(struct vio_dev *vdev, 


	ds_info = dp;



	start_powerd();



	return err;



out_free_ldc:

arch/sparc64/kernel/power.c

+2 −58
Original line number Diff line number Diff line
@@ -12,13 +12,13 @@ 
#include <linux/interrupt.h>

#include <linux/pm.h>

#include <linux/syscalls.h>

#include <linux/reboot.h>



#include <asm/system.h>

#include <asm/auxio.h>

#include <asm/prom.h>

#include <asm/of_device.h>

#include <asm/io.h>

#include <asm/power.h>

#include <asm/sstate.h>



#include <linux/unistd.h>
@@ -31,20 +31,9 @@ int scons_pwroff = 1; 


static void __iomem *power_reg;



static DECLARE_WAIT_QUEUE_HEAD(powerd_wait);

static int button_pressed;



void wake_up_powerd(void)

{

	if (button_pressed == 0) {

		button_pressed = 1;

		wake_up(&powerd_wait);

	}

}



static irqreturn_t power_handler(int irq, void *dev_id)

{

	wake_up_powerd();

	orderly_poweroff(true);



	/* FIXME: Check registers for status... */

	return IRQ_HANDLED;
@@ -77,48 +66,6 @@ void machine_power_off(void) 
void (*pm_power_off)(void) = machine_power_off;

EXPORT_SYMBOL(pm_power_off);



static int powerd(void *__unused)

{

	static char *envp[] = { "HOME=/", "TERM=linux", "PATH=/sbin:/usr/sbin:/bin:/usr/bin", NULL };

	char *argv[] = { "/sbin/shutdown", "-h", "now", NULL };

	DECLARE_WAITQUEUE(wait, current);



	daemonize("powerd");



	add_wait_queue(&powerd_wait, &wait);



	for (;;) {

		set_task_state(current, TASK_INTERRUPTIBLE);

		if (button_pressed)

			break;

		flush_signals(current);

		schedule();

	}

	__set_current_state(TASK_RUNNING);

	remove_wait_queue(&powerd_wait, &wait);



	/* Ok, down we go... */

	button_pressed = 0;

	if (kernel_execve("/sbin/shutdown", argv, envp) < 0) {

		printk(KERN_ERR "powerd: shutdown execution failed\n");

		machine_power_off();

	}

	return 0;

}



int start_powerd(void)

{

	int err;



	err = kernel_thread(powerd, NULL, CLONE_FS);

	if (err < 0)

		printk(KERN_ERR "power: Failed to start power daemon.\n");

	else

		printk(KERN_INFO "power: powerd running.\n");



	return err;

}



static int __init has_button_interrupt(unsigned int irq, struct device_node *dp)

{

	if (irq == 0xffffffff)
@@ -142,9 +89,6 @@ static int __devinit power_probe(struct of_device *op, const struct of_device_id 
	poweroff_method = machine_halt;  /* able to use the standard halt */



	if (has_button_interrupt(irq, op->node)) {

		if (start_powerd() < 0)

			return 0;



		if (request_irq(irq,

				power_handler, 0, "power", NULL) < 0)

			printk(KERN_ERR "power: Cannot setup IRQ handler.\n");

include/asm-sparc64/power.h

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
#ifndef _SPARC64_POWER_H

#define _SPARC64_POWER_H



extern void wake_up_powerd(void);

extern int start_powerd(void);



#endif /* !(_SPARC64_POWER_H) */