linux-next: manual merge of the akpm tree with the drm-intel tree

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
drivers/gpu/drm/i915/i915_gem.c between commit 5cef07e16283 ("drm/i915:
Move active/inactive lists to new mm") from the drm-intel tree and commit
"drivers-convert-shrinkers-to-new-count-scan-api-fix" from the akpm tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au

diff --cc drivers/gpu/drm/i915/i915_gem.c
index 50e26d3,a56feaa..0000000
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@@ -4614,10 -4570,9 +4614,10 @@@ i915_gem_inactive_count(struct shrinke
  			     struct drm_i915_private,
  			     mm.inactive_shrinker);
  	struct drm_device *dev = dev_priv->dev;
 +	struct i915_address_space *vm = &dev_priv->gtt.base;
  	struct drm_i915_gem_object *obj;
  	bool unlock = true;
- 	long cnt;
+ 	unsigned long count;
  
  	if (!mutex_trylock(&dev->struct_mutex)) {
  		if (!mutex_is_locked_by(&dev->struct_mutex, current))
@@@ -4629,13 -4584,13 +4629,13 @@@
  		unlock = false;
  	}
  
- 	cnt = 0;
+ 	count = 0;
  	list_for_each_entry(obj, &dev_priv->mm.unbound_list, global_list)
  		if (obj->pages_pin_count == 0)
- 			cnt += obj->base.size >> PAGE_SHIFT;
+ 			count += obj->base.size >> PAGE_SHIFT;
 -	list_for_each_entry(obj, &dev_priv->mm.inactive_list, mm_list)
 +	list_for_each_entry(obj, &vm->inactive_list, mm_list)
  		if (obj->pin_count == 0 && obj->pages_pin_count == 0)
- 			cnt += obj->base.size >> PAGE_SHIFT;
+ 			count += obj->base.size >> PAGE_SHIFT;
  
  	if (unlock)
  		mutex_unlock(&dev->struct_mutex);
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/dri-devel/attachments/20130718/892efc55/attachment.pgp>