From 300357cb693d23eb5b18839fa21b5b8b04d587f6 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 11 Jul 2007 12:05:36 +1000 Subject: [PATCH] --- yaml --- r: 60439 b: refs/heads/master c: 7c158acef8f0e51c3a5f71133aaf402628370a64 h: refs/heads/master i: 60437: a7756edb3e11891d40ad821f48f4a45529447fd0 60435: 966772d7139cdc704abd349a0f2214375e825594 60431: eab3fc071a114b4f2fa7cdf497c7e6c87b90d495 v: v3 --- [refs] | 2 +- trunk/drivers/char/drm/drm_fops.c | 3 --- trunk/drivers/char/drm/drm_stub.c | 6 ++++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index d3137a5fff05..d1829e6e2de8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6f710105f5a4971078c46ae258cbb76db1ee967a +refs/heads/master: 7c158acef8f0e51c3a5f71133aaf402628370a64 diff --git a/trunk/drivers/char/drm/drm_fops.c b/trunk/drivers/char/drm/drm_fops.c index e82e78fa42b0..d4b4dce68ad2 100644 --- a/trunk/drivers/char/drm/drm_fops.c +++ b/trunk/drivers/char/drm/drm_fops.c @@ -79,9 +79,6 @@ static int drm_setup(drm_device_t * dev) drm_ht_create(&dev->magiclist, DRM_MAGIC_HASH_ORDER); INIT_LIST_HEAD(&dev->magicfree); - INIT_LIST_HEAD(&dev->ctxlist); - INIT_LIST_HEAD(&dev->vmalist); - dev->sigdata.lock = NULL; init_waitqueue_head(&dev->lock.lock_queue); dev->queue_count = 0; diff --git a/trunk/drivers/char/drm/drm_stub.c b/trunk/drivers/char/drm/drm_stub.c index 59a9e7e5f128..331163001963 100644 --- a/trunk/drivers/char/drm/drm_stub.c +++ b/trunk/drivers/char/drm/drm_stub.c @@ -60,6 +60,10 @@ static int drm_fill_in_dev(drm_device_t * dev, struct pci_dev *pdev, int retcode; INIT_LIST_HEAD(&dev->filelist); + INIT_LIST_HEAD(&dev->ctxlist); + INIT_LIST_HEAD(&dev->vmalist); + INIT_LIST_HEAD(&dev->maplist); + spin_lock_init(&dev->count_lock); spin_lock_init(&dev->drw_lock); spin_lock_init(&dev->tasklet_lock); @@ -81,8 +85,6 @@ static int drm_fill_in_dev(drm_device_t * dev, struct pci_dev *pdev, return -ENOMEM; } - INIT_LIST_HEAD(&dev->maplist); - /* the DRM has 6 basic counters */ dev->counters = 6; dev->types[0] = _DRM_STAT_LOCK;