projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
powerpc/64s: Fix local irq disable when PMIs are disabled
[linux-2.6-microblaze.git]
/
arch
/
powerpc
/
include
/
asm
/
hw_irq.h
diff --git
a/arch/powerpc/include/asm/hw_irq.h
b/arch/powerpc/include/asm/hw_irq.h
index
77fa88c
..
0b7d01d
100644
(file)
--- a/
arch/powerpc/include/asm/hw_irq.h
+++ b/
arch/powerpc/include/asm/hw_irq.h
@@
-192,7
+192,7
@@
static inline void arch_local_irq_enable(void)
static inline unsigned long arch_local_irq_save(void)
{
- return irq_soft_mask_
set
_return(IRQS_DISABLED);
+ return irq_soft_mask_
or
_return(IRQS_DISABLED);
}
static inline bool arch_irqs_disabled_flags(unsigned long flags)