diff options
| author | Ian Romanick <idr@us.ibm.com> | 2003-02-05 01:48:29 +0000 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2003-02-05 01:48:29 +0000 |
| commit | 3bf1f686a5d81a54c7e569a1fc1a5226b07898b6 (patch) | |
| tree | 4c0073db241e250e23bb29662ffad6a04f7f9ba9 /linux | |
| parent | 2236fc781b306ebbf8afa10da0b92f40dfdc64b4 (diff) | |
Merge from trunk.texmem-0-0-1-20030204-trunk-merge
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/Makefile.linux | 2 | ||||
| -rw-r--r-- | linux/drm_dma.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/linux/Makefile.linux b/linux/Makefile.linux index 4505e6c11..633d96c4e 100644 --- a/linux/Makefile.linux +++ b/linux/Makefile.linux @@ -66,7 +66,7 @@ WARNINGS = -Wall -Wwrite-strings -Wpointer-arith -Wcast-align \ -Wstrict-prototypes -Wnested-externs \ -Wpointer-arith # -Wshadow -Winline -- make output too noisy -MODCFLAGS = $(CFLAGS) -D__KERNEL__ -DMODULE -fomit-frame-pointer +MODCFLAGS = $(CFLAGS) -D__KERNEL__ -DMODULE -fomit-frame-pointer -fno-strict-aliasing PRGCFLAGS = $(CFLAGS) -g -ansi -pedantic -DPOSIX_C_SOURCE=199309L \ -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE \ -I../../../../../../include -I../../../../../../../../include \ diff --git a/linux/drm_dma.h b/linux/drm_dma.h index 33af34be2..df4ed809f 100644 --- a/linux/drm_dma.h +++ b/linux/drm_dma.h @@ -628,6 +628,7 @@ int DRM(wait_vblank)( DRM_IOCTL_ARGS ) switch ( vblwait.request.type & ~_DRM_VBLANK_FLAGS_MASK ) { case _DRM_VBLANK_RELATIVE: vblwait.request.sequence += atomic_read( &dev->vbl_received ); + vblwait.request.type &= ~_DRM_VBLANK_RELATIVE; case _DRM_VBLANK_ABSOLUTE: break; default: |