Skip to content

L
linux-davinci-2.6.23
Commit 2cc60550 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

parents 3995f4c5 3ebc284d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 752 additions and 1363 deletions
arch/sparc64/defconfig
View file @ 2cc60550
This diff is collapsed.
arch/sparc64/kernel/entry.S
View file @ 2cc60550
...@@ -1657,13 +1657,10 @@ ret_sys_call: ...@@ -1657,13 +1657,10 @@ ret_sys_call:
/* Check if force_successful_syscall_return() /* Check if force_successful_syscall_return()
* was invoked. * was invoked.
*/ */
ldub [%curptr + TI_SYS_NOERROR], %l0 ldub [%curptr + TI_SYS_NOERROR], %l2
brz,pt %l0, 1f brnz,a,pn %l2, 80f
nop
ba,pt %xcc, 80f
stb %g0, [%curptr + TI_SYS_NOERROR] stb %g0, [%curptr + TI_SYS_NOERROR]
1:
cmp %o0, -ERESTART_RESTARTBLOCK cmp %o0, -ERESTART_RESTARTBLOCK
bgeu,pn %xcc, 1f bgeu,pn %xcc, 1f
andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT), %l6 andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT), %l6
......
arch/sparc64/kernel/power.c
View file @ 2cc60550
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include <linux/signal.h> #include <linux/signal.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/pm.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/ebus.h> #include <asm/ebus.h>
...@@ -70,6 +71,9 @@ void machine_power_off(void) ...@@ -70,6 +71,9 @@ void machine_power_off(void)
machine_halt(); machine_halt();
} }
void (*pm_power_off)(void) = machine_power_off;
EXPORT_SYMBOL(pm_power_off);
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
static int powerd(void *__unused) static int powerd(void *__unused)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment