From 1a56135e124abfff221480a215b568bc6be90fe8 Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@linux.intel.com>
Date: Thu, 19 Apr 2012 15:24:20 -0700
Subject: [PATCH] --- yaml --- r: 305435 b: refs/heads/master c:
 6a1ea279c210e7dc05de86dc29c0d4f577f484fb h: refs/heads/master i:   305433:
 228ea23b7cf5f0f8d35749dc86f7bc611a13e9b2   305431:
 6db9ce0073137be94ef878d4bc5c5d49bdfc44b2 v: v3

---
 [refs]                      |  2 +-
 trunk/arch/x86/mm/extable.c | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4844153ff972..bc7e5c140c11 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ffc4bc9c6fa4eaf935d96d139bfa7443cac0b88e
+refs/heads/master: 6a1ea279c210e7dc05de86dc29c0d4f577f484fb
diff --git a/trunk/arch/x86/mm/extable.c b/trunk/arch/x86/mm/extable.c
index 1fb85dbe390a..5555675dadb6 100644
--- a/trunk/arch/x86/mm/extable.c
+++ b/trunk/arch/x86/mm/extable.c
@@ -35,3 +35,20 @@ int fixup_exception(struct pt_regs *regs)
 
 	return 0;
 }
+
+/* Restricted version used during very early boot */
+int __init early_fixup_exception(unsigned long *ip)
+{
+	const struct exception_table_entry *fixup;
+
+	fixup = search_exception_tables(*ip);
+	if (fixup) {
+		if (fixup->fixup < 16)
+			return 0; /* Not supported during early boot */
+
+		*ip = fixup->fixup;
+		return 1;
+	}
+
+	return 0;
+}