|
@@ -9,6 +9,7 @@
|
|
#include <linux/smp.h>
|
|
#include <linux/smp.h>
|
|
#include <linux/string.h>
|
|
#include <linux/string.h>
|
|
#include <linux/spinlock.h>
|
|
#include <linux/spinlock.h>
|
|
|
|
+#include <linux/irqflags.h>
|
|
|
|
|
|
#include <asm/openprom.h>
|
|
#include <asm/openprom.h>
|
|
#include <asm/oplib.h>
|
|
#include <asm/oplib.h>
|
|
@@ -36,8 +37,8 @@ void p1275_cmd_direct(unsigned long *args)
|
|
{
|
|
{
|
|
unsigned long flags;
|
|
unsigned long flags;
|
|
|
|
|
|
- raw_local_save_flags(flags);
|
|
|
|
- raw_local_irq_restore((unsigned long)PIL_NMI);
|
|
|
|
|
|
+ local_save_flags(flags);
|
|
|
|
+ local_irq_restore((unsigned long)PIL_NMI);
|
|
raw_spin_lock(&prom_entry_lock);
|
|
raw_spin_lock(&prom_entry_lock);
|
|
|
|
|
|
prom_world(1);
|
|
prom_world(1);
|
|
@@ -45,7 +46,7 @@ void p1275_cmd_direct(unsigned long *args)
|
|
prom_world(0);
|
|
prom_world(0);
|
|
|
|
|
|
raw_spin_unlock(&prom_entry_lock);
|
|
raw_spin_unlock(&prom_entry_lock);
|
|
- raw_local_irq_restore(flags);
|
|
|
|
|
|
+ local_irq_restore(flags);
|
|
}
|
|
}
|
|
|
|
|
|
void prom_cif_init(void *cif_handler, void *cif_stack)
|
|
void prom_cif_init(void *cif_handler, void *cif_stack)
|