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 --- lib/test_printf.c | 4 +--- lib/vsprintf.c | 5 +---- 2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/lib/test_printf.c b/lib/test_printf.c index b9bf303907e2..28e2b7f52dfc 100644 --- a/lib/test_printf.c +++ b/lib/test_printf.c @@ -24,9 +24,7 @@
#include <linux/property.h>
-#ifdef __CHERI__ -#include <cheriintrin.h> -#endif +#include <linux/cheri.h>
#include "../tools/testing/selftests/kselftest_module.h"
diff --git a/lib/vsprintf.c b/lib/vsprintf.c index db0ec7372c4f..0e38291993ec 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -42,6 +42,7 @@ #include <linux/compiler.h> #include <linux/property.h> #include <linux/notifier.h> +#include <linux/cheri.h> #ifdef CONFIG_BLOCK #include <linux/blkdev.h> #endif @@ -52,10 +53,6 @@ #include <asm/byteorder.h> /* cpu_to_le16 */ #include <asm/unaligned.h>
-#ifdef __CHERI__ -#include <cheriintrin.h> -#endif - #include <linux/string_helpers.h> #include "kstrtox.h"