From 7de455206a7e326db05bf9321c005965ec452ca4 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
Date: Wed, 9 May 2012 12:47:03 +1000
Subject: [PATCH] --- yaml --- r: 307567 b: refs/heads/master c:
 6e5a429bcb132a68f17418ae82ba90ec4412084e h: refs/heads/master i:   307565:
 87dfd60c1ec5f7e87a8a80832a1439c2100a5618   307563:
 e97bdbae7d797b443e0f595cc41588b84cdda0e4   307559:
 af2ea576f0dcfd9262bca0586c6967b256621a9e   307551:
 40d3b4d4c3659ad43d4c1817b4ec373f1e07c539 v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/gpu/drm/nouveau/nouveau_object.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 89ed7b234628..af567dec33f1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 547e6c7fc81a34fd61669387f1d582af39cc5570
+refs/heads/master: 6e5a429bcb132a68f17418ae82ba90ec4412084e
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_object.c b/trunk/drivers/gpu/drm/nouveau/nouveau_object.c
index a3f961d98992..b190cc01c820 100644
--- a/trunk/drivers/gpu/drm/nouveau/nouveau_object.c
+++ b/trunk/drivers/gpu/drm/nouveau/nouveau_object.c
@@ -238,7 +238,7 @@ nouveau_gpuobj_takedown(struct drm_device *dev)
 		kfree(oc);
 	}
 
-	BUG_ON(!list_empty(&dev_priv->gpuobj_list));
+	WARN_ON(!list_empty(&dev_priv->gpuobj_list));
 }