diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2001-03-28 03:06:10 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2001-03-28 03:06:10 +0000 |
| commit | 0006681fe6b5ffaa4658d592e020d3a0c3594147 (patch) | |
| tree | db8d42c59fad73ff2c5df7452130bc4d7ef64cc6 /sys/alpha/pci/cia.c | |
| parent | b944b9033a951dd2202bb5c7d6f304d5ea09199e (diff) | |
| download | src-0006681fe6b5ffaa4658d592e020d3a0c3594147.tar.gz src-0006681fe6b5ffaa4658d592e020d3a0c3594147.zip | |
Switch from save/disable/restore_intr() to critical_enter/exit().
Notes
Notes:
svn path=/head/; revision=74903
Diffstat (limited to 'sys/alpha/pci/cia.c')
| -rw-r--r-- | sys/alpha/pci/cia.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sys/alpha/pci/cia.c b/sys/alpha/pci/cia.c index b7b8eb725b17..34e0fb4ea29f 100644 --- a/sys/alpha/pci/cia.c +++ b/sys/alpha/pci/cia.c @@ -155,13 +155,14 @@ cia_swiz_set_hae_mem(void *arg, u_int32_t pa) * Seems fairly paranoid but this is what Linux does... */ u_int32_t msb = pa & REG1; - int s = save_intr(); - disable_intr(); + critical_t s; + + s = critical_enter(); cia_hae_mem = (cia_hae_mem & ~REG1) | msb; REGVAL(CIA_CSR_HAE_MEM) = cia_hae_mem; alpha_mb(); cia_hae_mem = REGVAL(CIA_CSR_HAE_MEM); - restore_intr(s); + critical_exit(s); } return pa & ~REG1; } @@ -227,10 +228,10 @@ cia_sgmap_invalidate_pyxis(void) { volatile u_int64_t dummy; u_int32_t ctrl; - int i, s; + int i; + critical_t s; - s = save_intr(); - disable_intr(); + s = critical_enter(); /* * Put the Pyxis into PCI loopback mode. @@ -261,7 +262,7 @@ cia_sgmap_invalidate_pyxis(void) REGVAL(CIA_CSR_CTRL) = ctrl; alpha_mb(); - restore_intr(s); + critical_exit(s); } static void |