diff options
| author | Philip Guenther <guenther@cvs.openbsd.org> | 2014-03-29 18:09:32 +0000 |
|---|---|---|
| committer | Philip Guenther <guenther@cvs.openbsd.org> | 2014-03-29 18:09:32 +0000 |
| commit | 400e99c46f5fa56531015ba74096c3df72851d35 (patch) | |
| tree | 0faef85a6b863396e8ea71feee002ee3a2782234 /sys/arch/macppc/dev | |
| parent | 3756224bec69e72815aea2adefb844c05c376b26 (diff) | |
It's been a quarter century: we can assume volatile is present with that name.
ok dlg@ mpi@ deraadt@
Diffstat (limited to 'sys/arch/macppc/dev')
| -rw-r--r-- | sys/arch/macppc/dev/smu.c | 6 | ||||
| -rw-r--r-- | sys/arch/macppc/dev/zs.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/arch/macppc/dev/smu.c b/sys/arch/macppc/dev/smu.c index 1285278fe48..8b51078a653 100644 --- a/sys/arch/macppc/dev/smu.c +++ b/sys/arch/macppc/dev/smu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smu.c,v 1.23 2011/05/15 09:10:26 mpi Exp $ */ +/* $OpenBSD: smu.c,v 1.24 2014/03/29 18:09:29 guenther Exp $ */ /* * Copyright (c) 2005 Mark Kettenis @@ -408,7 +408,7 @@ smu_do_cmd(struct smu_softc *sc, int timo) sc->sc_cmdmap->dm_segs->ds_addr); /* Flush to RAM. */ - asm __volatile__ ("dcbst 0,%0; sync" :: "r"(sc->sc_cmd): "memory"); + asm volatile ("dcbst 0,%0; sync" :: "r"(sc->sc_cmd): "memory"); /* Ring doorbell. */ bus_space_write_1(sc->sc_memt, sc->sc_gpioh, 0, GPIO_DDR_OUTPUT); @@ -421,7 +421,7 @@ smu_do_cmd(struct smu_softc *sc, int timo) } while (!(gpio & (GPIO_DATA))); /* CPU might have brought back the cache line. */ - asm __volatile__ ("dcbf 0,%0; sync" :: "r"(sc->sc_cmd) : "memory"); + asm volatile ("dcbf 0,%0; sync" :: "r"(sc->sc_cmd) : "memory"); if (cmd->cmd != ack) return (EIO); diff --git a/sys/arch/macppc/dev/zs.c b/sys/arch/macppc/dev/zs.c index 2f0c0d07ccd..f49efcdf730 100644 --- a/sys/arch/macppc/dev/zs.c +++ b/sys/arch/macppc/dev/zs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: zs.c,v 1.22 2013/10/21 08:25:42 miod Exp $ */ +/* $OpenBSD: zs.c,v 1.23 2014/03/29 18:09:29 guenther Exp $ */ /* $NetBSD: zs.c,v 1.17 2001/06/19 13:42:15 wiz Exp $ */ /* @@ -517,7 +517,7 @@ zs_dma_setup(cs, pa, len) DBDMA_BUILD(cmdp, DBDMA_CMD_STOP, 0, 0, 0, DBDMA_INT_NEVER, DBDMA_WAIT_NEVER, DBDMA_BRANCH_NEVER); - __asm __volatile("eieio"); + __asm volatile("eieio"); dbdma_start(zsc->zsc_txdmareg[ch], zsc->zsc_txdmacmd[ch]); } |