From 1b548ecb36a047872603ee589b6fb29cafa5e65c Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Mon, 13 Feb 2012 20:42:18 +0000 Subject: [PATCH] --- yaml --- r: 287671 b: refs/heads/master c: 54321242afe6fcf8b7e589bc21ecf832bc5a206a h: refs/heads/master i: 287669: 601d806cc56e8a7cb22e7d5bd1dcbe3265af460a 287667: 886bcac06e300789a35112b6cd77a4cc2669355e 287663: c6276c108f7aa581bd8ac39fe1581aa9d8f4ce00 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 6043d8f34997..6d3d096aee1d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a1a1d1bfc9be2a5ea8cce78ebd0f17c79489f053 +refs/heads/master: 54321242afe6fcf8b7e589bc21ecf832bc5a206a diff --git a/trunk/arch/powerpc/kernel/exceptions-64s.S b/trunk/arch/powerpc/kernel/exceptions-64s.S index d4be7bb3dbdf..3844ca7c5099 100644 --- a/trunk/arch/powerpc/kernel/exceptions-64s.S +++ b/trunk/arch/powerpc/kernel/exceptions-64s.S @@ -775,7 +775,7 @@ program_check_common: EXCEPTION_PROLOG_COMMON(0x700, PACA_EXGEN) bl .save_nvgprs addi r3,r1,STACK_FRAME_OVERHEAD - ENABLE_INTS + DISABLE_INTS bl .program_check_exception b .ret_from_except