From 108fdbe329d32325ec4598e3817592af614cb12a Mon Sep 17 00:00:00 2001
From: ivila <390810839@qq.com>
Date: Fri, 25 Oct 2024 14:44:32 +0800
Subject: [PATCH] Fix CR: merge multiple conditions into one

---
 optee-utee/src/lib.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/optee-utee/src/lib.rs b/optee-utee/src/lib.rs
index 4827f4a1..679339ce 100644
--- a/optee-utee/src/lib.rs
+++ b/optee-utee/src/lib.rs
@@ -34,8 +34,7 @@ use core::panic::PanicInfo;
 #[cfg(not(target_os = "optee"))]
 use optee_utee_sys as raw;
 
-#[cfg(not(target_os = "optee"))]
-#[cfg(not(feature = "no_panic_handler"))]
+#[cfg(all(not(target_os = "optee"), not(feature = "no_panic_handler")))]
 #[panic_handler]
 fn panic(_info: &PanicInfo) -> ! {
     unsafe { raw::TEE_Panic(0); }