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
/
xtensa
/
kernel
/
time.c
diff --git
a/arch/xtensa/kernel/time.c
b/arch/xtensa/kernel/time.c
index
4a2c365
..
412ab32
100644
(file)
--- a/
arch/xtensa/kernel/time.c
+++ b/
arch/xtensa/kernel/time.c
@@
-52,7
+52,7
@@
unsigned long long sched_clock(void)
static irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs);
static struct irqaction timer_irqaction = {
.handler = timer_interrupt,
- .flags =
SA_INTERRUPT
,
+ .flags =
IRQF_DISABLED
,
.name = "timer",
};