Merge branch 'for-4.8/core' of git://git.kernel.dk/linux-block

[karo-tx-linux.git] / arch / s390 / kernel / cache.c

diff --git a/arch/s390/kernel/cache.c b/arch/s390/kernel/cache.c
index 77a84bd78be2b379e6cf5fcd0d623915cabd94e7..c8a83276a4dcb2413765356dd63f61bde30e6817 100644 (file)
--- a/arch/s390/kernel/cache.c
+++ b/arch/s390/kernel/cache.c
@@ -99,12 +99,7 @@ static inline enum cache_type get_cache_type(struct cache_info *ci, int level)
 
 static inline unsigned long ecag(int ai, int li, int ti)
 {
-       unsigned long cmd, val;
-
-       cmd = ai << 4 | li << 1 | ti;
-       asm volatile(".insn     rsy,0xeb000000004c,%0,0,0(%1)" /* ecag */
-                    : "=d" (val) : "a" (cmd));
-       return val;
+       return __ecag(ECAG_CACHE_ATTRIBUTE, ai << 4 | li << 1 | ti);
 }
 
 static void ci_leaf_init(struct cacheinfo *this_leaf, int private,