From e23ab95c8627039ec2c2ea7e864630d05e685dd9 Mon Sep 17 00:00:00 2001
From: Jason Baron <jbaron@redhat.com>
Date: Tue, 27 Jul 2010 13:18:01 -0700
Subject: [PATCH] --- yaml --- r: 201328 b: refs/heads/master c:
 b82bab4bbe9efa7bc7177fc20620fff19bd95484 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/kernel/module.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 398a99e800f1..f83e30f39c2a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d15aa2cc641bd193596382357de917b32f1b40cb
+refs/heads/master: b82bab4bbe9efa7bc7177fc20620fff19bd95484
diff --git a/trunk/kernel/module.c b/trunk/kernel/module.c
index 5d2d28197c82..6c562828c85c 100644
--- a/trunk/kernel/module.c
+++ b/trunk/kernel/module.c
@@ -787,7 +787,6 @@ SYSCALL_DEFINE2(delete_module, const char __user *, name_user,
 
 	/* Store the name of the last unloaded module for diagnostic purposes */
 	strlcpy(last_unloaded_module, mod->name, sizeof(last_unloaded_module));
-	ddebug_remove_module(mod->name);
 
 	free_module(mod);
 	return 0;
@@ -1550,6 +1549,9 @@ static void free_module(struct module *mod)
 	remove_sect_attrs(mod);
 	mod_kobject_remove(mod);
 
+	/* Remove dynamic debug info */
+	ddebug_remove_module(mod->name);
+
 	/* Arch-specific cleanup. */
 	module_arch_cleanup(mod);