---

yaml --- r: 245449 b: refs/heads/master c: 8ab2b7e h: refs/heads/master i: 245447: 7526f3d v: v3
git-mirror · Apr 30, 2011 · 23c70c0 · 23c70c0
1 parent 81b17f4
commit 23c70c0
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0778d9ad33898faab7bf6316108b471790376e35
+refs/heads/master: 8ab2b7efd3e2ccf2c2dda3206b8171ecdbd0af40
diff --git a/trunk/kernel/trace/ftrace.c b/trunk/kernel/trace/ftrace.c
@@ -2707,7 +2707,6 @@ static int ftrace_process_locs(struct module *mod,
 {
 	unsigned long *p;
 	unsigned long addr;
-	unsigned long flags;
 
 	mutex_lock(&ftrace_lock);
 	p = start;
@@ -2724,10 +2723,7 @@ static int ftrace_process_locs(struct module *mod,
 		ftrace_record_ip(addr);
 	}
 
-	/* disable interrupts to prevent kstop machine */
-	local_irq_save(flags);
 	ftrace_update_code(mod);
-	local_irq_restore(flags);
 	mutex_unlock(&ftrace_lock);
 
 	return 0;