From a9313a390671c7ce51517e15d491c0201b01bef9 Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Fri, 9 Jul 2010 15:21:41 +1000
Subject: [PATCH] --- yaml --- r: 204707 b: refs/heads/master c:
 0866eb99cc4d5951cb0ed6ddfa92d5a3d55216ae h: refs/heads/master i:   204705:
 42902e078dcd3552b1c443b8b0325f30b3bbb3aa   204703:
 d446ef1c603b73968dd812291f589d81f1a9ca31 v: v3

---
 [refs]                               | 2 +-
 trunk/arch/powerpc/include/asm/reg.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 253a85d8dd31..762bf5095d85 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cccd23428347251713b643d4bc5edb610308fd49
+refs/heads/master: 0866eb99cc4d5951cb0ed6ddfa92d5a3d55216ae
diff --git a/trunk/arch/powerpc/include/asm/reg.h b/trunk/arch/powerpc/include/asm/reg.h
index d62fdf4e504b..d8be016d2ede 100644
--- a/trunk/arch/powerpc/include/asm/reg.h
+++ b/trunk/arch/powerpc/include/asm/reg.h
@@ -890,7 +890,7 @@
 #ifndef __ASSEMBLY__
 #define mfmsr()		({unsigned long rval; \
 			asm volatile("mfmsr %0" : "=r" (rval)); rval;})
-#ifdef CONFIG_PPC64
+#ifdef CONFIG_PPC_BOOK3S_64
 #define __mtmsrd(v, l)	asm volatile("mtmsrd %0," __stringify(l) \
 				     : : "r" (v) : "memory")
 #define mtmsrd(v)	__mtmsrd((v), 0)