From eef06c5488df7ab725b47d3ad17c709462fdbd29 Mon Sep 17 00:00:00 2001
From: Auditya Bhattaram <quic_audityab@quicinc.com>
Date: Thu, 29 Feb 2024 20:34:15 +0530
Subject: [PATCH] ANDROID: Add __nocfi return for swsusp_arch_resume

Resolve the CFI failure problem encountered
during the restoration of the hibernation snapshot image.

Bug: 340049585
Signed-off-by: Mukesh Pilaniya <quic_mpilaniy@quicinc.com>
Signed-off-by: Auditya Bhattaram <quic_audityab@quicinc.com>
Signed-off-by: Kamati Srinivas <quic_kamasrin@quicinc.com>
(cherry picked from https://android-review.googlesource.com/q/commit:93f0348ea15b65656e1c2f909de3dd3bbf26599f)
Merged-In: I1f8f2c38e9d02a177c0cadb066419bf7edd66085
Change-Id: I1f8f2c38e9d02a177c0cadb066419bf7edd66085
---
 arch/arm64/kernel/hibernate.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/kernel/hibernate.c b/arch/arm64/kernel/hibernate.c
index 1bd732671427..1004b47cbf05 100644
--- a/arch/arm64/kernel/hibernate.c
+++ b/arch/arm64/kernel/hibernate.c
@@ -423,7 +423,7 @@ int swsusp_arch_suspend(void)
  * Memory allocated by get_safe_page() will be dealt with by the hibernate code,
  * we don't need to free it here.
  */
-int swsusp_arch_resume(void)
+int __nocfi swsusp_arch_resume(void)
 {
 	int rc;
 	void *zero_page;