projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'f2fs/dev'
[deliverable/linux.git]
/
arch
/
arm64
/
kernel
/
cacheinfo.c
diff --git
a/arch/arm64/kernel/cacheinfo.c
b/arch/arm64/kernel/cacheinfo.c
index b8629d52fba940739c076cbcb021f73f2aa855f3..9617301f76b56e6ba4410fe1895c50a96a81ec4f 100644
(file)
--- a/
arch/arm64/kernel/cacheinfo.c
+++ b/
arch/arm64/kernel/cacheinfo.c
@@
-39,7
+39,7
@@
static inline enum cache_type get_cache_type(int level)
if (level > MAX_CACHE_LEVEL)
return CACHE_TYPE_NOCACHE;
if (level > MAX_CACHE_LEVEL)
return CACHE_TYPE_NOCACHE;
-
asm volatile ("mrs %x0, clidr_el1" : "=r" (clidr)
);
+
clidr = read_sysreg(clidr_el1
);
return CLIDR_CTYPE(clidr, level);
}
return CLIDR_CTYPE(clidr, level);
}
@@
-55,11
+55,9
@@
u64 __attribute_const__ cache_get_ccsidr(u64 csselr)
WARN_ON(preemptible());
WARN_ON(preemptible());
- /* Put value into CSSELR */
- asm volatile("msr csselr_el1, %x0" : : "r" (csselr));
+ write_sysreg(csselr, csselr_el1);
isb();
isb();
- /* Read result out of CCSIDR */
- asm volatile("mrs %x0, ccsidr_el1" : "=r" (ccsidr));
+ ccsidr = read_sysreg(ccsidr_el1);
return ccsidr;
}
return ccsidr;
}
This page took
0.030522 seconds
and
5
git commands to generate.