From aa09ffb386dd81723be033b65e6b103149e40d03 Mon Sep 17 00:00:00 2001
From: Trent Piepho <xyzzy@speakeasy.org>
Date: Mon, 15 May 2006 09:44:06 -0700
Subject: [PATCH] --- yaml --- r: 26707 b: refs/heads/master c:
 5e376613899076396d0c97de67ad072587267370 h: refs/heads/master i:   26705:
 374917cf4d914d74e2fe74f8e3700239eeca32d3   26703:
 635d11b1e4510af0b2e72609938e48c9384833ef v: v3

---
 [refs]                       |  2 +-
 trunk/include/linux/kernel.h |  1 +
 trunk/kernel/extable.c       |  2 +-
 trunk/kernel/module.c        | 12 ++++++------
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 8331cd0b1ef2..a77d303ff18c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0159677857c5ada0a0a2c03a4dd59312382b73d0
+refs/heads/master: 5e376613899076396d0c97de67ad072587267370
diff --git a/trunk/include/linux/kernel.h b/trunk/include/linux/kernel.h
index e1bd0842f6a1..f4fc576ed4c4 100644
--- a/trunk/include/linux/kernel.h
+++ b/trunk/include/linux/kernel.h
@@ -124,6 +124,7 @@ extern int get_option(char **str, int *pint);
 extern char *get_options(const char *str, int nints, int *ints);
 extern unsigned long long memparse(char *ptr, char **retptr);
 
+extern int core_kernel_text(unsigned long addr);
 extern int __kernel_text_address(unsigned long addr);
 extern int kernel_text_address(unsigned long addr);
 extern int session_of_pgrp(int pgrp);
diff --git a/trunk/kernel/extable.c b/trunk/kernel/extable.c
index 7501b531ceed..7fe262855317 100644
--- a/trunk/kernel/extable.c
+++ b/trunk/kernel/extable.c
@@ -40,7 +40,7 @@ const struct exception_table_entry *search_exception_tables(unsigned long addr)
 	return e;
 }
 
-static int core_kernel_text(unsigned long addr)
+int core_kernel_text(unsigned long addr)
 {
 	if (addr >= (unsigned long)_stext &&
 	    addr <= (unsigned long)_etext)
diff --git a/trunk/kernel/module.c b/trunk/kernel/module.c
index d24deb0dbbc9..bbe04862e1b0 100644
--- a/trunk/kernel/module.c
+++ b/trunk/kernel/module.c
@@ -705,14 +705,14 @@ EXPORT_SYMBOL(__symbol_put);
 
 void symbol_put_addr(void *addr)
 {
-	unsigned long flags;
+	struct module *modaddr;
 
-	spin_lock_irqsave(&modlist_lock, flags);
-	if (!kernel_text_address((unsigned long)addr))
-		BUG();
+	if (core_kernel_text((unsigned long)addr))
+		return;
 
-	module_put(module_text_address((unsigned long)addr));
-	spin_unlock_irqrestore(&modlist_lock, flags);
+	if (!(modaddr = module_text_address((unsigned long)addr)))
+		BUG();
+	module_put(modaddr);
 }
 EXPORT_SYMBOL_GPL(symbol_put_addr);