merge

[plan9front.git] / sys / src / 9 / bcm / irq.c

diff --git a/sys/src/9/bcm/irq.c b/sys/src/9/bcm/irq.c
index 33c1d820b70975ca64114f94874f8ffbf370788e..e960d8c5c4214ad04df5260f2eb1bd7cd89a9681 100644 (file)
--- a/sys/src/9/bcm/irq.c
+++ b/sys/src/9/bcm/irq.c
@@ -106,7 +106,7 @@ fiq(Ureg *ureg)
 
        m->intr++;
        v = vfiq;
-       if(v == nil)
+       if(v == nil || m->machno)
                panic("cpu%d: unexpected item in bagging area", m->machno);
        coherence();
        v->f(ureg, v->a);
@@ -114,7 +114,7 @@ fiq(Ureg *ureg)
 }
 
 void
-irqenable(int irq, void (*f)(Ureg*, void*), void* a)
+intrenable(int irq, void (*f)(Ureg*, void*), void* a, int, char*)
 {
        Vctl *v;
        Intregs *ip;
@@ -149,6 +149,7 @@ irqenable(int irq, void (*f)(Ureg*, void*), void* a)
        if(irq == IRQfiq){
                assert((ip->FIQctl & Fiqenable) == 0);
                assert((*enable & v->mask) == 0);
+               assert(cpu == 0);
                vfiq = v;
                ip->FIQctl = Fiqenable | irq;
        }else{
@@ -164,3 +165,8 @@ irqenable(int irq, void (*f)(Ureg*, void*), void* a)
        }
        unlock(&vctllock);
 }
+
+void
+intrdisable(int, void (*)(Ureg*, void*), void*, int, char*)
+{
+}