Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2cc60550 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents 3995f4c5 3ebc284d

arch/sparc64/defconfig

+746 −1358

File changed.

Preview size limit exceeded, changes collapsed.

arch/sparc64/kernel/entry.S

+2 −5
Original line number Diff line number Diff line
@@ -1657,13 +1657,10 @@ ret_sys_call: 
	/* Check if force_successful_syscall_return()

	 * was invoked.

	 */

	ldub		[%curptr + TI_SYS_NOERROR], %l0

	brz,pt		%l0, 1f

	 nop

	ba,pt		%xcc, 80f

	ldub            [%curptr + TI_SYS_NOERROR], %l2

	brnz,a,pn       %l2, 80f

	 stb		%g0, [%curptr + TI_SYS_NOERROR]



1:

	cmp		%o0, -ERESTART_RESTARTBLOCK

	bgeu,pn		%xcc, 1f

	 andcc		%l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT), %l6

arch/sparc64/kernel/power.c

+4 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/signal.h>

#include <linux/delay.h>

#include <linux/interrupt.h>

#include <linux/pm.h>



#include <asm/system.h>

#include <asm/ebus.h>
@@ -70,6 +71,9 @@ void machine_power_off(void) 
	machine_halt();

}



void (*pm_power_off)(void) = machine_power_off;

EXPORT_SYMBOL(pm_power_off);



#ifdef CONFIG_PCI

static int powerd(void *__unused)

{