summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/include/asm/exception-64s.h
diff options
context:
space:
mode:
authorTiejun Chen <tiejun.chen@windriver.com>2013-07-16 11:09:30 +0800
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2013-08-14 14:57:47 +1000
commitde021bb79c7636df24864fa2dbb958121303663b (patch)
treec2833f1a4ac4455b2b4f1ca2bc19d0e3a321fcf2 /arch/powerpc/include/asm/exception-64s.h
parent7033b64b48a3eafdd5d5f541ff6ccb96f69d9911 (diff)
downloadblackbird-op-linux-de021bb79c7636df24864fa2dbb958121303663b.tar.gz
blackbird-op-linux-de021bb79c7636df24864fa2dbb958121303663b.zip
powerpc/ppc64: Rename SOFT_DISABLE_INTS with RECONCILE_IRQ_STATE
The SOFT_DISABLE_INTS seems an odd name for something that updates the software state to be consistent with interrupts being hard disabled, so rename SOFT_DISABLE_INTS with RECONCILE_IRQ_STATE to avoid this confusion. Signed-off-by: Tiejun Chen <tiejun.chen@windriver.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/include/asm/exception-64s.h')
-rw-r--r--arch/powerpc/include/asm/exception-64s.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/exception-64s.h b/arch/powerpc/include/asm/exception-64s.h
index 07ca627e52c0..4834a6d5a75c 100644
--- a/arch/powerpc/include/asm/exception-64s.h
+++ b/arch/powerpc/include/asm/exception-64s.h
@@ -479,7 +479,7 @@ label##_relon_hv: \
*/
/* Exception addition: Hard disable interrupts */
-#define DISABLE_INTS SOFT_DISABLE_INTS(r10,r11)
+#define DISABLE_INTS RECONCILE_IRQ_STATE(r10,r11)
#define ADD_NVGPRS \
bl .save_nvgprs
OpenPOWER on IntegriCloud