aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc64/kernel/power.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2006-10-02 05:18:26 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-02 10:57:23 -0400
commit6760856791c6e527da678021ee6a67896549d4da (patch)
tree31bf78dac3a2ea68282ae394aeedb15bc92ae7d7 /arch/sparc64/kernel/power.c
parent2453a3062d36f39f01302f9f1ad18e7a0c54fe38 (diff)
[PATCH] introduce kernel_execve
The use of execve() in the kernel is dubious, since it relies on the __KERNEL_SYSCALLS__ mechanism that stores the result in a global errno variable. As a first step of getting rid of this, change all users to a global kernel_execve function that returns a proper error code. This function is a terrible hack, and a later patch removes it again after the kernel syscalls are gone. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Andi Kleen <ak@muc.de> Cc: Paul Mackerras <paulus@samba.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Richard Henderson <rth@twiddle.net> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Cc: Russell King <rmk@arm.linux.org.uk> Cc: Ian Molton <spyro@f2s.com> Cc: Mikael Starvik <starvik@axis.com> Cc: David Howells <dhowells@redhat.com> Cc: Yoshinori Sato <ysato@users.sourceforge.jp> Cc: Hirokazu Takata <takata.hirokazu@renesas.com> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Kyle McMartin <kyle@mcmartin.ca> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Paul Mundt <lethal@linux-sh.org> Cc: Kazumoto Kojima <kkojima@rr.iij4u.or.jp> Cc: Richard Curnow <rc@rc0.org.uk> Cc: William Lee Irwin III <wli@holomorphy.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: Jeff Dike <jdike@addtoit.com> Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Cc: Miles Bader <uclinux-v850@lsi.nec.co.jp> Cc: Chris Zankel <chris@zankel.net> Cc: "Luck, Tony" <tony.luck@intel.com> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Roman Zippel <zippel@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/sparc64/kernel/power.c')
-rw-r--r--arch/sparc64/kernel/power.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/sparc64/kernel/power.c b/arch/sparc64/kernel/power.c
index e55466c77b61..0b9c70627ce4 100644
--- a/arch/sparc64/kernel/power.c
+++ b/arch/sparc64/kernel/power.c
@@ -4,8 +4,6 @@
4 * Copyright (C) 1999 David S. Miller (davem@redhat.com) 4 * Copyright (C) 1999 David S. Miller (davem@redhat.com)
5 */ 5 */
6 6
7#define __KERNEL_SYSCALLS__
8
9#include <linux/kernel.h> 7#include <linux/kernel.h>
10#include <linux/module.h> 8#include <linux/module.h>
11#include <linux/init.h> 9#include <linux/init.h>
@@ -14,6 +12,7 @@
14#include <linux/delay.h> 12#include <linux/delay.h>
15#include <linux/interrupt.h> 13#include <linux/interrupt.h>
16#include <linux/pm.h> 14#include <linux/pm.h>
15#include <linux/syscalls.h>
17 16
18#include <asm/system.h> 17#include <asm/system.h>
19#include <asm/auxio.h> 18#include <asm/auxio.h>
@@ -98,7 +97,7 @@ again:
98 97
99 /* Ok, down we go... */ 98 /* Ok, down we go... */
100 button_pressed = 0; 99 button_pressed = 0;
101 if (execve("/sbin/shutdown", argv, envp) < 0) { 100 if (kernel_execve("/sbin/shutdown", argv, envp) < 0) {
102 printk("powerd: shutdown execution failed\n"); 101 printk("powerd: shutdown execution failed\n");
103 add_wait_queue(&powerd_wait, &wait); 102 add_wait_queue(&powerd_wait, &wait);
104 goto again; 103 goto again;