--- v10
+++ v7
@@ -53,10 +53,10 @@
  extern void irq_ctx_init(void);
  void call_do_softirq(void *sp);
 diff --git a/arch/powerpc/include/asm/processor.h b/arch/powerpc/include/asm/processor.h
-index 15acb282a876..8179b64871ed 100644
+index b225c7f7c5a4..e763342265a2 100644
 --- a/arch/powerpc/include/asm/processor.h
 +++ b/arch/powerpc/include/asm/processor.h
-@@ -325,8 +325,7 @@ struct thread_struct {
+@@ -331,8 +331,7 @@ struct thread_struct {
  #define ARCH_MIN_TASKALIGN 16
  
  #define INIT_SP		(sizeof(init_stack) + (unsigned long) &init_stack)
@@ -67,12 +67,12 @@
  #ifdef CONFIG_SPE
  #define SPEFSCR_INIT \
 diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c
-index 1fb52206c106..94ac190a0b16 100644
+index 833d189df04c..768ce602d624 100644
 --- a/arch/powerpc/kernel/asm-offsets.c
 +++ b/arch/powerpc/kernel/asm-offsets.c
-@@ -92,7 +92,6 @@ int main(void)
- 	DEFINE(SIGSEGV, SIGSEGV);
+@@ -93,7 +93,6 @@ int main(void)
  	DEFINE(NMI_MASK, NMI_MASK);
+ 	OFFSET(TASKTHREADPPR, task_struct, thread.ppr);
  #else
 -	DEFINE(THREAD_INFO_GAP, _ALIGN_UP(sizeof(struct thread_info), 16));
  	OFFSET(KSP_LIMIT, thread_struct, ksp_limit);
@@ -205,10 +205,10 @@
  	lwz	r10,8(r1)
  	lwz	r1,0(r1)
 diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
-index 6a43d8395553..b9ab0467987f 100644
+index a12307ebb7ef..23657b00e161 100644
 --- a/arch/powerpc/kernel/process.c
 +++ b/arch/powerpc/kernel/process.c
-@@ -1691,8 +1691,7 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
+@@ -1689,8 +1689,7 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
  	sp -= STACK_FRAME_OVERHEAD;
  	p->thread.ksp = sp;
  #ifdef CONFIG_PPC32
@@ -218,7 +218,7 @@
  #endif
  #ifdef CONFIG_HAVE_HW_BREAKPOINT
  	p->thread.ptrace_bps[0] = NULL;
-@@ -1995,21 +1994,14 @@ static inline int valid_irq_stack(unsigned long sp, struct task_struct *p,
+@@ -1986,21 +1985,14 @@ static inline int valid_irq_stack(unsigned long sp, struct task_struct *p,
  	unsigned long stack_page;
  	unsigned long cpu = task_cpu(p);
  
@@ -248,7 +248,7 @@
  	return 0;
  }
  
-@@ -2018,8 +2010,10 @@ int validate_sp(unsigned long sp, struct task_struct *p,
+@@ -2009,8 +2001,10 @@ int validate_sp(unsigned long sp, struct task_struct *p,
  {
  	unsigned long stack_page = (unsigned long)task_stack_page(p);
  
@@ -262,10 +262,10 @@
  
  	return valid_irq_stack(sp, p, nbytes);
 diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
-index d2bc5e4dc1ba..0b227d0891ec 100644
+index 2d682f3e31c6..6792e9c90689 100644
 --- a/arch/powerpc/kernel/setup_64.c
 +++ b/arch/powerpc/kernel/setup_64.c
-@@ -718,22 +718,22 @@ void __init emergency_stack_init(void)
+@@ -717,22 +717,22 @@ void __init emergency_stack_init(void)
  	limit = min(ppc64_bolted_size(), ppc64_rma_size);
  
  	for_each_possible_cpu(i) {