OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v4.9.95' into android-4.9.95
[android-x86/kernel.git]
/
arch
/
arm64
/
include
/
asm
/
cpucaps.h
diff --git
a/arch/arm64/include/asm/cpucaps.h
b/arch/arm64/include/asm/cpucaps.h
index
ce67bf6
..
04dcdf9
100644
(file)
--- a/
arch/arm64/include/asm/cpucaps.h
+++ b/
arch/arm64/include/asm/cpucaps.h
@@
-34,9
+34,10
@@
#define ARM64_HAS_32BIT_EL0 13
#define ARM64_HYP_OFFSET_LOW 14
#define ARM64_MISMATCHED_CACHE_LINE_SIZE 15
#define ARM64_HAS_32BIT_EL0 13
#define ARM64_HYP_OFFSET_LOW 14
#define ARM64_MISMATCHED_CACHE_LINE_SIZE 15
-#define ARM64_UNMAP_KERNEL_AT_EL0 16
-#define ARM64_HARDEN_BRANCH_PREDICTOR 17
-#define ARM64_NCAPS 18
+#define ARM64_UNMAP_KERNEL_AT_EL0 23
+#define ARM64_HARDEN_BRANCH_PREDICTOR 24
+
+#define ARM64_NCAPS 25
#endif /* __ASM_CPUCAPS_H */
#endif /* __ASM_CPUCAPS_H */