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 'for-linus' of git://oss.sgi.com/xfs/xfs
[pandora-kernel.git]
/
arch
/
sparc
/
prom
/
p1275.c
diff --git
a/arch/sparc/prom/p1275.c
b/arch/sparc/prom/p1275.c
index
fa6e4e2
..
d9850c2
100644
(file)
--- a/
arch/sparc/prom/p1275.c
+++ b/
arch/sparc/prom/p1275.c
@@
-39,7
+39,7
@@
void p1275_cmd_direct(unsigned long *args)
unsigned long flags;
raw_local_save_flags(flags);
unsigned long flags;
raw_local_save_flags(flags);
- raw_local_irq_restore(PIL_NMI);
+ raw_local_irq_restore(
(unsigned long)
PIL_NMI);
raw_spin_lock(&prom_entry_lock);
prom_world(1);
raw_spin_lock(&prom_entry_lock);
prom_world(1);