Merge branch 'master' into tk71

[mv-sheeva.git] / arch / sparc / prom / p1275.c

diff --git a/arch/sparc/prom/p1275.c b/arch/sparc/prom/p1275.c
index fa6e4e219b9ce436db25fcf3aa168d4b9f559ae2..d9850c2b9bf21275fb6e2de0ba69842a6c35b723 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);
-       raw_local_irq_restore(PIL_NMI);
+       raw_local_irq_restore((unsigned long)PIL_NMI);
        raw_spin_lock(&prom_entry_lock);
 
        prom_world(1);