projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6
[powerpc.git]
/
include
/
asm-arm
/
domain.h
diff --git
a/include/asm-arm/domain.h
b/include/asm-arm/domain.h
index
f8ea2de
..
3c12a76
100644
(file)
--- a/
include/asm-arm/domain.h
+++ b/
include/asm-arm/domain.h
@@
-50,11
+50,14
@@
#define domain_val(dom,type) ((type) << (2*(dom)))
#ifndef __ASSEMBLY__
#define domain_val(dom,type) ((type) << (2*(dom)))
#ifndef __ASSEMBLY__
+
+#ifdef CONFIG_MMU
#define set_domain(x) \
do { \
__asm__ __volatile__( \
"mcr p15, 0, %0, c3, c0 @ set domain" \
: : "r" (x)); \
#define set_domain(x) \
do { \
__asm__ __volatile__( \
"mcr p15, 0, %0, c3, c0 @ set domain" \
: : "r" (x)); \
+ isb(); \
} while (0)
#define modify_domain(dom,type) \
} while (0)
#define modify_domain(dom,type) \
@@
-66,5
+69,10
@@
set_domain(thread->cpu_domain); \
} while (0)
set_domain(thread->cpu_domain); \
} while (0)
+#else
+#define set_domain(x) do { } while (0)
+#define modify_domain(dom,type) do { } while (0)
+#endif
+
#endif
#endif /* !__ASSEMBLY__ */
#endif
#endif /* !__ASSEMBLY__ */