Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
arch
/
arm64
/
include
/
asm
/
cpufeature.h
diff --git
a/kernel/arch/arm64/include/asm/cpufeature.h
b/kernel/arch/arm64/include/asm/cpufeature.h
index
8f271b8
..
8884b5d
100644
(file)
--- a/
kernel/arch/arm64/include/asm/cpufeature.h
+++ b/
kernel/arch/arm64/include/asm/cpufeature.h
@@
-30,8
+30,9
@@
#define ARM64_HAS_LSE_ATOMICS 5
#define ARM64_WORKAROUND_CAVIUM_23154 6
#define ARM64_WORKAROUND_834220 7
#define ARM64_HAS_LSE_ATOMICS 5
#define ARM64_WORKAROUND_CAVIUM_23154 6
#define ARM64_WORKAROUND_834220 7
+#define ARM64_WORKAROUND_CAVIUM_27456 8
-#define ARM64_NCAPS
8
+#define ARM64_NCAPS
9
#ifndef __ASSEMBLY__
#ifndef __ASSEMBLY__
@@
-76,7
+77,7
@@
struct arm64_cpu_capabilities {
const char *desc;
u16 capability;
bool (*matches)(const struct arm64_cpu_capabilities *);
const char *desc;
u16 capability;
bool (*matches)(const struct arm64_cpu_capabilities *);
-
void (*enable)(void *);
/* Called on all active CPUs */
+
int (*enable)(void *);
/* Called on all active CPUs */
union {
struct { /* To be used for erratum handling only */
u32 midr_model;
union {
struct { /* To be used for erratum handling only */
u32 midr_model;