From 85842852f419b10e879cef9980badd55e2f37ab9 Mon Sep 17 00:00:00 2001
From: Livio Soares <livio@eecg.toronto.edu>
Date: Wed, 7 Feb 2007 12:51:36 +1100
Subject: [PATCH] --- yaml --- r: 46879 b: refs/heads/master c:
 449d846dbcbf61bdf7d50a923e4791102168c292 h: refs/heads/master i:   46877:
 890fc88e238c16a6d5dfa65e2d1273d330636138   46875:
 253c48a34e5aada95baf098e842d921b174edc3a   46871:
 0cbaf34f90970228bf50d1f094b8074afca806d9   46863:
 ee830e695b978fed0b8a588c5f2f5667cd2ebab5   46847:
 8e3d81e956d25d0060afdf9b0faf2f17c013318b v: v3

---
 [refs]                              | 2 +-
 trunk/arch/powerpc/kernel/head_64.S | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5b13cd85d4df..a48edd45e09f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a2c70211fa072f4076f0e59f909b69105f69072e
+refs/heads/master: 449d846dbcbf61bdf7d50a923e4791102168c292
diff --git a/trunk/arch/powerpc/kernel/head_64.S b/trunk/arch/powerpc/kernel/head_64.S
index 71b1fe58e9e4..97cedcd6c9b4 100644
--- a/trunk/arch/powerpc/kernel/head_64.S
+++ b/trunk/arch/powerpc/kernel/head_64.S
@@ -613,7 +613,7 @@ system_call_pSeries:
 /*** pSeries interrupt support ***/
 
 	/* moved from 0xf00 */
-	MASKABLE_EXCEPTION_PSERIES(., performance_monitor)
+	STD_EXCEPTION_PSERIES(., performance_monitor)
 
 /*
  * An interrupt came in while soft-disabled; clear EE in SRR1,