diff options
| author | Eric Anholt <anholt@freebsd.org> | 2003-03-11 20:51:28 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2003-03-11 20:51:28 +0000 |
| commit | 0bd0dd2300e91707ae5a41a83eb37217fd8ad295 (patch) | |
| tree | 55a4bdeef5e1bfadf163506449860d56ae1d0f51 /bsd-core/drm_memory.c | |
| parent | 638d45d2a0f5101e0b10a4f2761f9e25d2872055 (diff) | |
Merge back from FreeBSD-current, adding FreeBSD ID tags to aid future
merging. Also includes an update to radeon PCI IDs.
Diffstat (limited to 'bsd-core/drm_memory.c')
| -rw-r--r-- | bsd-core/drm_memory.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/bsd-core/drm_memory.c b/bsd-core/drm_memory.c index aa81363f..95d6110d 100644 --- a/bsd-core/drm_memory.c +++ b/bsd-core/drm_memory.c @@ -27,6 +27,8 @@ * Authors: * Rickard E. (Rik) Faith <faith@valinux.com> * Gareth Hughes <gareth@valinux.com> + * + * $FreeBSD: src/sys/dev/drm/drm_memory.h,v 1.7 2003/03/09 02:08:28 anholt Exp $ */ #include "drmP.h" @@ -106,7 +108,8 @@ void DRM(mem_uninit)(void) #ifdef __FreeBSD__ /* drm_mem_info is called whenever a process reads /dev/drm/mem. */ -static int DRM(_mem_info)(drm_mem_stats_t *stats, struct sysctl_oid *oidp, void *arg1, +static int +DRM(_mem_info)(drm_mem_stats_t *stats, struct sysctl_oid *oidp, void *arg1, int arg2, struct sysctl_req *req) { drm_mem_stats_t *pt; |