Now that we have our own header for CHERI APIs, let's include it instead of the compiler-provided cheriintrin.h. This also allows removing the #ifdef'ing, as linux/cheri.h already takes care of including cheriintrin.h if available.
Signed-off-by: Kevin Brodsky kevin.brodsky@arm.com --- arch/arm64/kernel/signal.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c index c21ef7bebcae..9e1e9c54a3e4 100644 --- a/arch/arm64/kernel/signal.c +++ b/arch/arm64/kernel/signal.c @@ -19,6 +19,7 @@ #include <linux/resume_user_mode.h> #include <linux/ratelimit.h> #include <linux/syscalls.h> +#include <linux/cheri.h>
#include <asm/daifflags.h> #include <asm/debug-monitors.h> @@ -38,10 +39,6 @@ #include <asm/traps.h> #include <asm/vdso.h>
-#ifdef CONFIG_CHERI_PURECAP_UABI -#include <cheriintrin.h> -#endif - #ifndef SIGNAL_COMPAT64 /* * Do a signal return; undo the signal stack. These are aligned to 128-bit.