From owner-svn-src-stable-7@FreeBSD.ORG  Tue Jun 23 16:11:44 2009
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D0FE0106566C;
	Tue, 23 Jun 2009 16:11:44 +0000 (UTC)
	(envelope-from rnoland@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BE1B38FC12;
	Tue, 23 Jun 2009 16:11:44 +0000 (UTC)
	(envelope-from rnoland@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5NGBiJ8082604;
	Tue, 23 Jun 2009 16:11:44 GMT (envelope-from rnoland@svn.freebsd.org)
Received: (from rnoland@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5NGBiFJ082602;
	Tue, 23 Jun 2009 16:11:44 GMT (envelope-from rnoland@svn.freebsd.org)
Message-Id: <200906231611.n5NGBiFJ082602@svn.freebsd.org>
From: Robert Noland <rnoland@FreeBSD.org>
Date: Tue, 23 Jun 2009 16:11:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194735 - in stable/7/sys: . contrib/pf dev/drm
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 23 Jun 2009 16:11:45 -0000

Author: rnoland
Date: Tue Jun 23 16:11:44 2009
New Revision: 194735
URL: http://svn.freebsd.org/changeset/base/194735

Log:
  Merge 194537 from HEAD
  
  Don't panic if drm_rmmap is called with a NULL map pointer.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/drm/drm_bufs.c

Modified: stable/7/sys/dev/drm/drm_bufs.c
==============================================================================
--- stable/7/sys/dev/drm/drm_bufs.c	Tue Jun 23 16:09:05 2009	(r194734)
+++ stable/7/sys/dev/drm/drm_bufs.c	Tue Jun 23 16:11:44 2009	(r194735)
@@ -296,6 +296,9 @@ void drm_rmmap(struct drm_device *dev, d
 {
 	DRM_SPINLOCK_ASSERT(&dev->dev_lock);
 
+	if (map == NULL)
+		return;
+
 	TAILQ_REMOVE(&dev->maplist, map, link);
 
 	switch (map->type) {