diff options
author | Kyle McMartin <kyle@redhat.com> | 2011-06-09 10:25:34 -0400 |
---|---|---|
committer | Kyle McMartin <kyle@redhat.com> | 2011-06-09 10:25:34 -0400 |
commit | 490bb4b273450ce8872ec4c27c78336d963f5191 (patch) | |
tree | ac19d40e277f7a12ca3fba152ce5ec33a45ed2f2 /revert-ftrace-remove-unnecessary-disabling-of-irqs.patch | |
parent | 99b6793a5de50335f9898a96e31016b206955aa7 (diff) | |
download | kernel-490bb4b273450ce8872ec4c27c78336d963f5191.tar.gz kernel-490bb4b273450ce8872ec4c27c78336d963f5191.tar.xz kernel-490bb4b273450ce8872ec4c27c78336d963f5191.zip |
rhbz#710921: revert-ftrace-remove-unnecessary-disabling-of-irqs.patch
Diffstat (limited to 'revert-ftrace-remove-unnecessary-disabling-of-irqs.patch')
-rw-r--r-- | revert-ftrace-remove-unnecessary-disabling-of-irqs.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/revert-ftrace-remove-unnecessary-disabling-of-irqs.patch b/revert-ftrace-remove-unnecessary-disabling-of-irqs.patch new file mode 100644 index 000000000..31e8c34c4 --- /dev/null +++ b/revert-ftrace-remove-unnecessary-disabling-of-irqs.patch @@ -0,0 +1,36 @@ +From 2735da6316af256e62d5f6c15ffa451182734bc3 Mon Sep 17 00:00:00 2001 +From: Kyle McMartin <kyle@mcmartin.ca> +Date: Thu, 9 Jun 2011 10:19:15 -0400 +Subject: Revert "ftrace: Remove unnecessary disabling of irqs" + +This reverts commit 8ab2b7efd3e2ccf2c2dda3206b8171ecdbd0af40. +--- + kernel/trace/ftrace.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c +index 1ee417f..a75432a 100644 +--- a/kernel/trace/ftrace.c ++++ b/kernel/trace/ftrace.c +@@ -3330,6 +3330,7 @@ static int ftrace_process_locs(struct module *mod, + { + unsigned long *p; + unsigned long addr; ++ unsigned long flags; + + mutex_lock(&ftrace_lock); + p = start; +@@ -3346,7 +3347,10 @@ 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; +-- +1.7.5.2 + |