Change intr_enable to intr_restore for consistency with sparc64.
This commit is contained in:
parent
ebba8a0edc
commit
a2763677ec
@ -394,7 +394,7 @@ kdb_trap(int vector, struct trapframe *regs)
|
||||
|
||||
*regs = ddb_regs;
|
||||
|
||||
intr_enable(s);
|
||||
intr_restore(s);
|
||||
|
||||
|
||||
/*
|
||||
|
@ -610,7 +610,7 @@ pmap_invalidate_all_1(void *arg)
|
||||
}
|
||||
addr += pmap_ptc_e_stride1;
|
||||
}
|
||||
intr_enable(psr);
|
||||
intr_restore(psr);
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -90,7 +90,7 @@ sapic_read_rte(struct sapic *sa, int which,
|
||||
c = intr_disable();
|
||||
p[0] = sapic_read(sa, SAPIC_RTE_BASE + 2*which);
|
||||
p[1] = sapic_read(sa, SAPIC_RTE_BASE + 2*which + 1);
|
||||
intr_enable(c);
|
||||
intr_restore(c);
|
||||
}
|
||||
|
||||
#endif
|
||||
@ -105,7 +105,7 @@ sapic_write_rte(struct sapic *sa, int which,
|
||||
c = intr_disable();
|
||||
sapic_write(sa, SAPIC_RTE_BASE + 2*which, p[0]);
|
||||
sapic_write(sa, SAPIC_RTE_BASE + 2*which + 1, p[1]);
|
||||
intr_enable(c);
|
||||
intr_restore(c);
|
||||
}
|
||||
|
||||
struct sapic *
|
||||
|
@ -295,7 +295,7 @@ intr_disable(void)
|
||||
}
|
||||
|
||||
static __inline void
|
||||
intr_enable(critical_t psr)
|
||||
intr_restore(critical_t psr)
|
||||
{
|
||||
__asm __volatile ("mov psr.l=%0;; srlz.d" :: "r" (psr));
|
||||
}
|
||||
@ -309,7 +309,7 @@ cpu_critical_enter(void)
|
||||
static __inline void
|
||||
cpu_critical_exit(critical_t psr)
|
||||
{
|
||||
intr_enable(psr);
|
||||
intr_restore(psr);
|
||||
}
|
||||
|
||||
#endif /* _KERNEL */
|
||||
|
Loading…
Reference in New Issue
Block a user