From f4980d78424bdedd89e0d2c0fc04c7b5f38deef0 Mon Sep 17 00:00:00 2001 From: Michael Ellerman Date: Mon, 20 Feb 2012 21:32:30 +0000 Subject: [PATCH] --- yaml --- r: 287831 b: refs/heads/master c: 922b9f86a020258d3ea3bfed27251efaed7a03a3 h: refs/heads/master i: 287829: 1eb91c8cc9f14f7d4ab02941fdf1e92913d38c27 287827: f5195d59b33804ce20116b1e6934bb5201230586 287823: 5cf95e821b8cb7219c49859231900c5812d53e83 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/exceptions-64s.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1e985ec7f7e8..2e2146fe9e4e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 07d2f1a54a78a648093f4f3a33aa86b03cf9e25f +refs/heads/master: 922b9f86a020258d3ea3bfed27251efaed7a03a3 diff --git a/trunk/arch/powerpc/kernel/exceptions-64s.S b/trunk/arch/powerpc/kernel/exceptions-64s.S index 3844ca7c5099..15c5a4f6de01 100644 --- a/trunk/arch/powerpc/kernel/exceptions-64s.S +++ b/trunk/arch/powerpc/kernel/exceptions-64s.S @@ -774,8 +774,8 @@ alignment_common: program_check_common: EXCEPTION_PROLOG_COMMON(0x700, PACA_EXGEN) bl .save_nvgprs - addi r3,r1,STACK_FRAME_OVERHEAD DISABLE_INTS + addi r3,r1,STACK_FRAME_OVERHEAD bl .program_check_exception b .ret_from_except