Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: math-emu: Fix thinko in _FP_DIV math-emu: Fix signalling of underflow and inexact while packing result. sparc: Add checkstack support sparc: correct section of current_pc() sparc: correct section of apc_no_idle sparc64: Fix race in arch/sparc64/kernel/trampoline.S
This commit is contained in:
@@ -31,7 +31,7 @@
|
||||
#define APC_DEVNAME "apc"
|
||||
|
||||
static u8 __iomem *regs;
|
||||
static int apc_no_idle __initdata = 0;
|
||||
static int apc_no_idle __devinitdata = 0;
|
||||
|
||||
#define apc_readb(offs) (sbus_readb(regs+offs))
|
||||
#define apc_writeb(val, offs) (sbus_writeb(val, regs+offs))
|
||||
|
@@ -465,6 +465,7 @@ gokernel:
|
||||
mov %o7, %g4 ! Save %o7
|
||||
|
||||
/* Jump to it, and pray... */
|
||||
__INIT
|
||||
current_pc:
|
||||
call 1f
|
||||
nop
|
||||
|
Reference in New Issue
Block a user