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/octeon/include | |
| 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/octeon/include')
| -rw-r--r-- | sys/arch/octeon/include/bus.h | 4 | ||||
| -rw-r--r-- | sys/arch/octeon/include/octeonvar.h | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/arch/octeon/include/bus.h b/sys/arch/octeon/include/bus.h index ceacab49c62..efe398f5da9 100644 --- a/sys/arch/octeon/include/bus.h +++ b/sys/arch/octeon/include/bus.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bus.h,v 1.5 2014/03/10 21:32:15 miod Exp $ */ +/* $OpenBSD: bus.h,v 1.6 2014/03/29 18:09:30 guenther Exp $ */ /* * Copyright (c) 2003-2004 Opsycon AB Sweden. All rights reserved. @@ -298,7 +298,7 @@ static inline void bus_space_barrier(bus_space_tag_t t, bus_space_handle_t h, bus_size_t offset, bus_size_t length, int flags) { - __asm__ __volatile__ ("sync" ::: "memory"); + __asm__ volatile ("sync" ::: "memory"); } #define BUS_SPACE_BARRIER_READ 0x01 /* force read barrier */ #define BUS_SPACE_BARRIER_WRITE 0x02 /* force write barrier */ diff --git a/sys/arch/octeon/include/octeonvar.h b/sys/arch/octeon/include/octeonvar.h index 4b0bf100bc4..2441d3fea24 100644 --- a/sys/arch/octeon/include/octeonvar.h +++ b/sys/arch/octeon/include/octeonvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: octeonvar.h,v 1.15 2013/11/04 17:51:03 bcallah Exp $ */ +/* $OpenBSD: octeonvar.h,v 1.16 2014/03/29 18:09:30 guenther Exp $ */ /* $NetBSD: maltavar.h,v 1.3 2002/03/18 10:10:16 simonb Exp $ */ /*- @@ -297,7 +297,7 @@ ffs64(uint64_t val) { int ret; - __asm __volatile ( \ + __asm volatile ( \ _ASM_PROLOGUE_MIPS64 " dclz %0, %1 \n" _ASM_EPILOGUE @@ -367,7 +367,7 @@ octeon_disable_interrupt(uint32_t *new) { uint32_t s, tmp; - __asm __volatile ( + __asm volatile ( _ASM_PROLOGUE " mfc0 %[s], $12 \n" " and %[tmp], %[s], ~1 \n" @@ -383,7 +383,7 @@ octeon_disable_interrupt(uint32_t *new) static inline void octeon_restore_status(uint32_t s) { - __asm __volatile ( + __asm volatile ( _ASM_PROLOGUE " mtc0 %[s], $12 \n" _ASM_EPILOGUE @@ -395,7 +395,7 @@ octeon_get_cycles(void) { uint64_t tmp; - __asm __volatile ( + __asm volatile ( _ASM_PROLOGUE_MIPS64 " dmfc0 %[tmp], $9, 6 \n" _ASM_EPILOGUE |