Module Name: src
Committed By: jmcneill
Date: Sat Oct 17 16:19:38 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/drm: drm_drv.c
Log Message:
fix __OS_HAS_AGP=0 build
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/external/bsd/drm2/drm/drm_drv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/drm/drm_drv.c
diff -u src/sys/external/bsd/drm2/drm/drm_drv.c:1.15 src/sys/external/bsd/drm2/drm/drm_drv.c:1.16
--- src/sys/external/bsd/drm2/drm/drm_drv.c:1.15 Sun Mar 8 23:37:56 2015
+++ src/sys/external/bsd/drm2/drm/drm_drv.c Sat Oct 17 16:19:38 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_drv.c,v 1.15 2015/03/08 23:37:56 riastradh Exp $ */
+/* $NetBSD: drm_drv.c,v 1.16 2015/10/17 16:19:38 jmcneill Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.15 2015/03/08 23:37:56 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.16 2015/10/17 16:19:38 jmcneill Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -87,6 +87,7 @@ static drm_ioctl_t drm_version;
.cmd_drv = 0, \
}
+#if __OS_HAS_AGP
/* XXX Kludge for AGP. */
static drm_ioctl_t drm_agp_acquire_hook_ioctl;
static drm_ioctl_t drm_agp_release_hook_ioctl;
@@ -105,6 +106,7 @@ static drm_ioctl_t drm_agp_unbind_hook_i
#define drm_agp_free_ioctl drm_agp_free_hook_ioctl
#define drm_agp_bind_ioctl drm_agp_bind_hook_ioctl
#define drm_agp_unbind_ioctl drm_agp_unbind_hook_ioctl
+#endif
/* Table copied verbatim from dist/drm/drm_drv.c. */
static const struct drm_ioctl_desc drm_ioctls[] = {
@@ -805,6 +807,8 @@ drm_agp_clear_hook(struct drm_device *de
(*hooks->agph_clear)(dev);
}
+#if __OS_HAS_AGP
+
#define DEFINE_AGP_HOOK_IOCTL(NAME, HOOK) \
static int \
NAME(struct drm_device *dev, void *data, struct drm_file *file) \
@@ -825,3 +829,5 @@ DEFINE_AGP_HOOK_IOCTL(drm_agp_alloc_hook
DEFINE_AGP_HOOK_IOCTL(drm_agp_free_hook_ioctl, agph_free_ioctl)
DEFINE_AGP_HOOK_IOCTL(drm_agp_bind_hook_ioctl, agph_bind_ioctl)
DEFINE_AGP_HOOK_IOCTL(drm_agp_unbind_hook_ioctl, agph_unbind_ioctl)
+
+#endif
