From d129267fe005ab51432bbd8d66ebe7cc030efaa6 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@google.com>
Date: Fri, 17 Jul 2020 14:49:23 +0200
Subject: [PATCH] Revert "ANDROID: x86/extable: Do not mark exception callback
 as CFI"

This reverts commit f436f8ad8f5688eda376c74f3082d2cf3aa19034 as CFI is
being removed from the tree to come back later as a "clean" set of
patches.

Bug: 145210207
Cc: Sami Tolvanen <samitolvanen@google.com>
Cc: Kees Cook <keescook@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I54a1afeda35066b3e0090e519abf6dd63bbe1806
---
 arch/x86/mm/extable.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c
index ca71d78a65da..1d6cb07f4f86 100644
--- a/arch/x86/mm/extable.c
+++ b/arch/x86/mm/extable.c
@@ -138,7 +138,6 @@ __visible bool ex_has_fault_handler(unsigned long ip)
 	return handler == ex_handler_fault;
 }
 
-__nocfi
 int fixup_exception(struct pt_regs *regs, int trapnr, unsigned long error_code,
 		    unsigned long fault_addr)
 {