git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
drivers
/
char
/
drm
/
drm_memory_debug.h
diff --git
a/drivers/char/drm/drm_memory_debug.h
b/drivers/char/drm/drm_memory_debug.h
index
4d57979
..
0053679
100644
(file)
--- a/
drivers/char/drm/drm_memory_debug.h
+++ b/
drivers/char/drm/drm_memory_debug.h
@@
-67,6
+67,7
@@
static drm_mem_stats_t DRM(mem_stats)[] = {
[DRM_MEM_TOTALAGP] = { "totalagp" },
[DRM_MEM_BOUNDAGP] = { "boundagp" },
[DRM_MEM_CTXBITMAP] = { "ctxbitmap"},
[DRM_MEM_TOTALAGP] = { "totalagp" },
[DRM_MEM_BOUNDAGP] = { "boundagp" },
[DRM_MEM_CTXBITMAP] = { "ctxbitmap"},
+ [DRM_MEM_CTXLIST] = { "ctxlist" },
[DRM_MEM_STUB] = { "stub" },
{ NULL, 0, } /* Last entry must be null */
};
[DRM_MEM_STUB] = { "stub" },
{ NULL, 0, } /* Last entry must be null */
};
@@
-351,7
+352,7
@@
void DRM(ioremapfree)(void *pt, unsigned long size, drm_device_t *dev)
}
}
}
}
-#if __
REALLY_HAVE
_AGP
+#if __
OS_HAS
_AGP
DRM_AGP_MEM *DRM(alloc_agp)(int pages, u32 type)
{
DRM_AGP_MEM *DRM(alloc_agp)(int pages, u32 type)
{