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

Commit d2de6888 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Ingo Molnar
Browse files

sparc64: extend TI_RESTART_BLOCK space by 8 bytes 



Impact: build fix

Today's linux-next build (sparc64 defconfig) failed like this:

  arch/sparc/kernel/built-in.o: In function `trap_init':
  (.init.text+0x4): undefined reference to `thread_info_offsets_are_bolixed_dave'

Caused by commit 52400ba9 ("futex: add
requeue_pi functionality") (from the tip-core tree) which changed the
size of struct restart_block.

Shift TI_KUNA_REGS and TI_KUNA_INSN up by 8 bytes to make space for the
larger restart block.

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Acked-by: default avatar"David S. Miller" <davem@davemloft.net>
Cc: Darren Hart <dvhltc@us.ibm.com>
LKML-Reference: <20090409151722.c8eabb56.sfr@canb.auug.org.au>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent bab5bc9e

arch/sparc/include/asm/thread_info_64.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -102,8 +102,8 @@ struct thread_info { 
#define TI_KERN_CNTD1	0x00000488

#define TI_KERN_CNTD1	0x00000488

#define TI_PCR		0x00000490

#define TI_PCR		0x00000490

#define TI_RESTART_BLOCK 0x00000498

#define TI_RESTART_BLOCK 0x00000498

#define TI_KUNA_REGS	0x000004c0

#define TI_KUNA_REGS	0x000004c8

#define TI_KUNA_INSN	0x000004c8

#define TI_KUNA_INSN	0x000004d0

#define TI_FPREGS	0x00000500

#define TI_FPREGS	0x00000500





/* We embed this in the uppermost byte of thread_info->flags */

/* We embed this in the uppermost byte of thread_info->flags */