lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Linus Torvalds
2006-01-09 15:10:22 -08:00
parent 3995f4c532 3ebc284d52
commit 2cc6055060
3 changed files with 758 additions and 1369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2116
arch/sparc64/defconfig
View File

File diff suppressed because it is too large Load Diff

7
arch/sparc64/kernel/entry.S
View File

@@ -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

4
arch/sparc64/kernel/power.c
View File

@@ -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)
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)
{ {