From 81045a66619fb4caaa7793db13be3c6f918ec185 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Wed, 4 Jul 2012 17:05:28 +0100
Subject: [PATCH] --- yaml --- r: 311719 b: refs/heads/master c:
 82401bf105495c593544375b4748f48fce70d9c4 h: refs/heads/master i:   311717:
 2b09a697813b4c0bcb6d87264994a8a7e111049c   311715:
 9d4859e46bbfb5c01a8ef447b1b7f44a5c7e3268   311711:
 4272c0aa917b5ea36f6224c9ef6f304a6ca23867 v: v3

---
 [refs]                              |  2 +-
 trunk/arch/arm/include/asm/domain.h | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index da4eda1292e3..e3a0bb4eb78e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 32e1eb59f7042c03cb8dbb598e7c97fddbb62ac2
+refs/heads/master: 82401bf105495c593544375b4748f48fce70d9c4
diff --git a/trunk/arch/arm/include/asm/domain.h b/trunk/arch/arm/include/asm/domain.h
index 3d2220498abc..6ddbe446425e 100644
--- a/trunk/arch/arm/include/asm/domain.h
+++ b/trunk/arch/arm/include/asm/domain.h
@@ -60,13 +60,13 @@
 #ifndef __ASSEMBLY__
 
 #ifdef CONFIG_CPU_USE_DOMAINS
-#define set_domain(x)					\
-	do {						\
-	__asm__ __volatile__(				\
-	"mcr	p15, 0, %0, c3, c0	@ set domain"	\
-	  : : "r" (x));					\
-	isb();						\
-	} while (0)
+static inline void set_domain(unsigned val)
+{
+	asm volatile(
+	"mcr	p15, 0, %0, c3, c0	@ set domain"
+	  : : "r" (val));
+	isb();
+}
 
 #define modify_domain(dom,type)					\
 	do {							\
@@ -78,8 +78,8 @@
 	} while (0)
 
 #else
-#define set_domain(x)		do { } while (0)
-#define modify_domain(dom,type)	do { } while (0)
+static inline void set_domain(unsigned val) { }
+static inline void modify_domain(unsigned dom, unsigned type)	{ }
 #endif
 
 /*