From bbfbae40efd4594a44ba89936b8a5fd565d83d25 Mon Sep 17 00:00:00 2001 From: jmcneill Date: Mon, 19 May 2008 21:05:37 +0000 Subject: Don't use MALLOC_DECLARE / MALLOC_DEFINE if building as a module. --- sys/dev/drm/drmP.h | 6 +++++- sys/dev/drm/drm_memory.c | 6 ++++-- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'sys/dev') diff --git a/sys/dev/drm/drmP.h b/sys/dev/drm/drmP.h index bc3b1f59962..d273e4d7b65 100644 --- a/sys/dev/drm/drmP.h +++ b/sys/dev/drm/drmP.h @@ -1,4 +1,4 @@ -/* $NetBSD: drmP.h,v 1.26 2008/05/19 00:17:39 bjs Exp $ */ +/* $NetBSD: drmP.h,v 1.27 2008/05/19 21:05:37 jmcneill Exp $ */ /* drmP.h -- Private header for Direct Rendering Manager -*- linux-c -*- * Created: Mon Jan 4 10:05:05 1999 by faith@precisioninsight.com @@ -194,7 +194,11 @@ typedef struct drm_file drm_file_t; #define DRM_IF_VERSION(maj, min) (maj << 16 | min) +#if !defined(_MODULE) MALLOC_DECLARE(M_DRM); +#else +#define M_DRM M_TEMP +#endif #define __OS_HAS_AGP 1 diff --git a/sys/dev/drm/drm_memory.c b/sys/dev/drm/drm_memory.c index efc982915c9..d75d153db92 100644 --- a/sys/dev/drm/drm_memory.c +++ b/sys/dev/drm/drm_memory.c @@ -1,4 +1,4 @@ -/* $NetBSD: drm_memory.c,v 1.11 2008/05/18 19:53:22 jmcneill Exp $ */ +/* $NetBSD: drm_memory.c,v 1.12 2008/05/19 21:05:37 jmcneill Exp $ */ /* drm_memory.h -- Memory management wrappers for DRM -*- linux-c -*- * Created: Thu Feb 4 14:00:34 1999 by faith@valinux.com @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: drm_memory.c,v 1.11 2008/05/18 19:53:22 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: drm_memory.c,v 1.12 2008/05/19 21:05:37 jmcneill Exp $"); /* __FBSDID("$FreeBSD: src/sys/dev/drm/drm_memory.c,v 1.2 2005/11/28 23:13:52 anholt Exp $"); */ @@ -54,7 +54,9 @@ __FBSDID("$FreeBSD: src/sys/dev/drm/drm_memory.c,v 1.2 2005/11/28 23:13:52 anhol #endif #endif +#if !defined(_MODULE) MALLOC_DEFINE(M_DRM, "drm", "DRM Data Structures"); +#endif void drm_mem_init(void) { -- cgit