Merge "Use consistent SMCCC error code" into integration
This commit is contained in:
commit
b3c287f472
|
@ -12,6 +12,4 @@
|
||||||
#define SMCCC_ARCH_WORKAROUND_1 U(0x80008000)
|
#define SMCCC_ARCH_WORKAROUND_1 U(0x80008000)
|
||||||
#define SMCCC_ARCH_WORKAROUND_2 U(0x80007FFF)
|
#define SMCCC_ARCH_WORKAROUND_2 U(0x80007FFF)
|
||||||
|
|
||||||
#define SMCCC_ARCH_NOT_REQUIRED -2
|
|
||||||
|
|
||||||
#endif /* ARM_ARCH_SVC_H */
|
#endif /* ARM_ARCH_SVC_H */
|
||||||
|
|
|
@ -66,7 +66,7 @@ static int32_t smccc_arch_features(u_register_t arg)
|
||||||
return 0;
|
return 0;
|
||||||
#else
|
#else
|
||||||
/* Either the CPUs are unaffected or permanently mitigated */
|
/* Either the CPUs are unaffected or permanently mitigated */
|
||||||
return SMCCC_ARCH_NOT_REQUIRED;
|
return SMC_ARCH_CALL_NOT_REQUIRED;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue