diff options
| author |   miod <miod@openbsd.org> | 2010-05-15 15:27:15 +0000 |
|---|---|---|
| committer | miod <miod@openbsd.org> | 2010-05-15 15:27:15 +0000 |
| commit | c33ac6b1fb26a51710328c1f656162ba0997b18e (patch) | |
| tree | 3202c4bb0bec97353d3a71582c23e0693f85dbf4 | |
| parent | Always check the tiling mode alignment on pin, even if we don't need a (diff) | |
| download | wireguard-openbsd-c33ac6b1fb26a51710328c1f656162ba0997b18e.tar.xz wireguard-openbsd-c33ac6b1fb26a51710328c1f656162ba0997b18e.zip | |
Make fb_pfour_id() take a volatile pointer as argument.
| -rw-r--r-- | sys/arch/sparc/dev/fb.c | 4 | ||||
| -rw-r--r-- | sys/arch/sparc/include/fbvar.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/sparc/dev/fb.c b/sys/arch/sparc/dev/fb.c index 7ca2ff43ff3..17f0b19cd34 100644 --- a/sys/arch/sparc/dev/fb.c +++ b/sys/arch/sparc/dev/fb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fb.c,v 1.49 2009/06/03 20:17:48 kettenis Exp $ */ +/* $OpenBSD: fb.c,v 1.50 2010/05/15 15:27:15 miod Exp $ */ /* $NetBSD: fb.c,v 1.23 1997/07/07 23:30:22 pk Exp $ */ /* @@ -625,7 +625,7 @@ fb_show_screen(void *v, void *cookie, int waitok, void (*cb)(void *, int, int), * otherwise returns P4 ID */ int -fb_pfour_id(void *va) +fb_pfour_id(volatile void *va) { volatile u_int32_t val, save, *pfour = va; diff --git a/sys/arch/sparc/include/fbvar.h b/sys/arch/sparc/include/fbvar.h index f3ae5a7fb07..86bfe63fa42 100644 --- a/sys/arch/sparc/include/fbvar.h +++ b/sys/arch/sparc/include/fbvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: fbvar.h,v 1.17 2006/12/03 16:38:13 miod Exp $ */ +/* $OpenBSD: fbvar.h,v 1.18 2010/05/15 15:27:16 miod Exp $ */ /* $NetBSD: fbvar.h,v 1.9 1997/07/07 23:31:30 pk Exp $ */ /* @@ -82,6 +82,6 @@ void fbwscons_setcolormap(struct sunfb *, void fbwscons_attach(struct sunfb *, struct wsdisplay_accessops *, int); #if defined(SUN4) -int fb_pfour_id(void *); +int fb_pfour_id(volatile void *); void fb_pfour_burner(void *, u_int, u_int); #endif |