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 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
arch
/
sparc
/
kernel
/
tick14.c
diff --git
a/arch/sparc/kernel/tick14.c
b/arch/sparc/kernel/tick14.c
index
a55f046
..
707bfda
100644
(file)
--- a/
arch/sparc/kernel/tick14.c
+++ b/
arch/sparc/kernel/tick14.c
@@
-64,7
+64,7
@@
void claim_ticker14(irq_handler_t handler,
/* first we copy the obp handler instructions
*/
- disable_irq(irq_nr);
+
__
disable_irq(irq_nr);
if (!handler)
return;
@@
-81,6
+81,6
@@
void claim_ticker14(irq_handler_t handler,
NULL)) {
install_linux_ticker();
load_profile_irq(cpu, timeout);
- enable_irq(irq_nr);
+
__
enable_irq(irq_nr);
}
}