git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
[pandora-kernel.git]
/
arch
/
ia64
/
kernel
/
perfmon.c
diff --git
a/arch/ia64/kernel/perfmon.c
b/arch/ia64/kernel/perfmon.c
index
92b815d
..
c7ccd6e
100644
(file)
--- a/
arch/ia64/kernel/perfmon.c
+++ b/
arch/ia64/kernel/perfmon.c
@@
-6439,7
+6439,7
@@
pfm_flush_pmds(struct task_struct *task, pfm_context_t *ctx)
static struct irqaction perfmon_irqaction = {
.handler = pfm_interrupt_handler,
- .flags =
SA_INTERRUPT
,
+ .flags =
IRQF_DISABLED
,
.name = "perfmon"
};