diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2012-03-15 18:52:58 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2012-03-15 18:52:58 +0000 |
| commit | 582f87978beb9c9f7445650954ace087e85f9398 (patch) | |
| tree | 6eff60bd8d1325a17fd617b69823e2b220bef46f /sys/arch/sgi/include/bus.h | |
| parent | 455dea0141a10eb7483a6230db513464f2c8236f (diff) | |
No longer allow bus_space_barrier() to be a NULL pointer on a given
bus_space_tag on sgi, but rather always provide at least a dummy asm("sync")
flavour. Saves a function pointer test at runtime.
Diffstat (limited to 'sys/arch/sgi/include/bus.h')
| -rw-r--r-- | sys/arch/sgi/include/bus.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/arch/sgi/include/bus.h b/sys/arch/sgi/include/bus.h index 11231ce7429..f43ef116773 100644 --- a/sys/arch/sgi/include/bus.h +++ b/sys/arch/sgi/include/bus.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bus.h,v 1.24 2010/08/23 16:56:15 miod Exp $ */ +/* $OpenBSD: bus.h,v 1.25 2012/03/15 18:52:55 miod Exp $ */ /* * Copyright (c) 2003-2004 Opsycon AB Sweden. All rights reserved. @@ -299,10 +299,7 @@ static __inline void bus_space_barrier(bus_space_tag_t t, bus_space_handle_t h, bus_size_t offs, bus_size_t len, int flags) { - if (t->_space_barrier != NULL) - (*(t)->_space_barrier)(t, h, offs, len, flags); - else - __asm__ __volatile__ ("sync" ::: "memory"); + (*(t)->_space_barrier)(t, h, offs, len, flags); } #define BUS_SPACE_BARRIER_READ 0x01 /* force read barrier */ |