Bug #11951: Fix an errno sign inversion on pre-FreeBSD 5.

Also, annotate where signs change, to hopefully remind the reader of these
issues in the future.

diff --git a/bsd-core/drmP.h b/bsd-core/drmP.h
index 73342d09cf4d23508b4deb1e2b1728fc1fcfd00a..8a768f0cccbd4059d35fc3bd0361975614af7fca 100644 (file)
--- a/bsd-core/drmP.h
+++ b/bsd-core/drmP.h
@@ -377,6 +377,7 @@ do {                                                                        \
 } while (0)
 
 #if defined(__FreeBSD__) && __FreeBSD_version > 500000
+/* Returns -errno to shared code */
 #define DRM_WAIT_ON( ret, queue, timeout, condition )          \
 for ( ret = 0 ; !ret && !(condition) ; ) {                     \
        DRM_UNLOCK();                                           \
@@ -388,11 +389,12 @@ for ( ret = 0 ; !ret && !(condition) ; ) {                        \
        DRM_LOCK();                                             \
 }
 #else
+/* Returns -errno to shared code */
 #define DRM_WAIT_ON( ret, queue, timeout, condition )  \
 for ( ret = 0 ; !ret && !(condition) ; ) {             \
         int s = spldrm();                              \
        if (!(condition))                               \
-          ret = tsleep( &(queue), PZERO | PCATCH,      \
+          ret = -tsleep( &(queue), PZERO | PCATCH,     \
                         "drmwtq", (timeout) );         \
        splx(s);                                        \
 }

diff --git a/bsd-core/drm_dma.c b/bsd-core/drm_dma.c
index fc1e12509213e8681a15c8559c2e2b8a9451a279..4896cf22347a1e27218ec7963177c474f8d9e8ca 100644 (file)
--- a/bsd-core/drm_dma.c
+++ b/bsd-core/drm_dma.c
@@ -121,6 +121,7 @@ int drm_dma(drm_device_t *dev, void *data, struct drm_file *file_priv)
 {
 
        if (dev->driver.dma_ioctl) {
+               /* shared code returns -errno */
                return -dev->driver.dma_ioctl(dev, data, file_priv);
        } else {
                DRM_DEBUG("DMA ioctl on driver with no dma handler\n");

diff --git a/bsd-core/drm_fops.c b/bsd-core/drm_fops.c
index 870e4d291991a765effd3b6df554b7d269aea419..2d037ea5fb133b58bdbf442bc0cfb375e0a39afd 100644 (file)
--- a/bsd-core/drm_fops.c
+++ b/bsd-core/drm_fops.c
@@ -93,6 +93,7 @@ int drm_open_helper(struct cdev *kdev, int flags, int fmt, DRM_STRUCTPROC *p,
                priv->authenticated     = DRM_SUSER(p);
 
                if (dev->driver.open) {
+                       /* shared code returns -errno */
                        retcode = -dev->driver.open(dev, priv);
                        if (retcode != 0) {
                                free(priv, M_DRM);

diff --git a/bsd-core/drm_irq.c b/bsd-core/drm_irq.c
index 1ab532feb72c81ee7749ebd3e2d604c170c27958..9c437e9dbd2afdd7e2906a8f37f42a7d947de03a 100644 (file)
--- a/bsd-core/drm_irq.c
+++ b/bsd-core/drm_irq.c
@@ -241,6 +241,7 @@ int drm_wait_vblank(drm_device_t *dev, void *data, struct drm_file *file_priv)
                ret = EINVAL;
        } else {
                DRM_LOCK();
+               /* shared code returns -errno */
                ret = -dev->driver.vblank_wait(dev,
                    &vblwait->request.sequence);
                DRM_UNLOCK();