diff --git a/bsd-core/drmP.h b/bsd-core/drmP.h
index fd8f4a27..ff8ad473 100644
--- a/bsd-core/drmP.h
+++ b/bsd-core/drmP.h
@@ -998,6 +998,8 @@ int	drm_dma(DRM_IOCTL_ARGS);
 /* IRQ support (drm_irq.c) */
 int	drm_control(DRM_IOCTL_ARGS);
 int	drm_wait_vblank(DRM_IOCTL_ARGS);
+void	drm_locked_tasklet(drm_device_t *dev,
+			   void (*tasklet)(drm_device_t *dev));
 
 /* AGP/GART support (drm_agpsupport.c) */
 int	drm_agp_acquire_ioctl(DRM_IOCTL_ARGS);
diff --git a/bsd-core/drm_drawable.c b/bsd-core/drm_drawable.c
index ad25a6df..b81d0a75 100644
--- a/bsd-core/drm_drawable.c
+++ b/bsd-core/drm_drawable.c
@@ -103,6 +103,7 @@ int drm_rmdraw(DRM_IOCTL_ARGS)
 		free_unr(dev->drw_unrhdr, draw->handle);
 		drm_free(info, sizeof(struct bsd_drm_drawable_info),
 		    DRM_MEM_DRAWABLE);
+		return 0;
 	} else {
 		DRM_SPINUNLOCK(&dev->drw_lock);
 		return EINVAL;
diff --git a/shared-core/radeon_irq.c b/shared-core/radeon_irq.c
index ad8a0ac7..b973b968 100644
--- a/shared-core/radeon_irq.c
+++ b/shared-core/radeon_irq.c
@@ -144,8 +144,9 @@ static int radeon_wait_irq(struct drm_device * dev, int swi_nr)
 	return ret;
 }
 
-int radeon_driver_vblank_do_wait(struct drm_device * dev, unsigned int *sequence,
-				 int crtc)
+static int radeon_driver_vblank_do_wait(struct drm_device * dev,
+					unsigned int *sequence,
+					int crtc)
 {
 	drm_radeon_private_t *dev_priv =
 	    (drm_radeon_private_t *) dev->dev_private;