From 7779659390afc5608655e617aa3f2c88b7e071c5 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 17 Aug 2005 10:48:38 +0000 Subject: revert reversion of a part of a patch from Jon, that I did last night while checking things in in my sleep --- linux-core/drm_bufs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'linux-core/drm_bufs.c') diff --git a/linux-core/drm_bufs.c b/linux-core/drm_bufs.c index bad02f2d..d10973c7 100644 --- a/linux-core/drm_bufs.c +++ b/linux-core/drm_bufs.c @@ -56,7 +56,8 @@ static drm_local_map_t *drm_find_matching_map(drm_device_t *dev, list_for_each(list, &dev->maplist->head) { drm_map_list_t *entry = list_entry(list, drm_map_list_t, head); if (entry->map && map->type == entry->map->type && - entry->map->offset == map->offset) { + ((entry->map->offset == map->offset) || + (map->type == _DRM_SHM))) { return entry->map; } } -- cgit v1.2.3