diff options
| author | David S. Miller <davem@davemloft.net> | 2013-04-03 01:31:54 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-04-03 01:31:54 -0400 |
| commit | d66248326410ed0d3e813ebe974b3e6638df0717 (patch) | |
| tree | a1dbe86f5540596a70c6f3b9aab051d37f37daf5 /drivers/gpu/drm/i915/i915_gem_execbuffer.c | |
| parent | 8facd5fb73c6e960555e5913743dfbb6c3d984a5 (diff) | |
| parent | da241efcd9c3da2af6ba20055c7e158ec725005c (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull net into net-next to get the synchronize_net() bug fix in
bonding.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_execbuffer.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c index 3b11ab0fbc96..9a48e1a2d417 100644 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c | |||
| @@ -57,7 +57,7 @@ eb_create(struct drm_i915_gem_execbuffer2 *args) | |||
| 57 | if (eb == NULL) { | 57 | if (eb == NULL) { |
| 58 | int size = args->buffer_count; | 58 | int size = args->buffer_count; |
| 59 | int count = PAGE_SIZE / sizeof(struct hlist_head) / 2; | 59 | int count = PAGE_SIZE / sizeof(struct hlist_head) / 2; |
| 60 | BUILD_BUG_ON(!is_power_of_2(PAGE_SIZE / sizeof(struct hlist_head))); | 60 | BUILD_BUG_ON_NOT_POWER_OF_2(PAGE_SIZE / sizeof(struct hlist_head)); |
| 61 | while (count > 2*size) | 61 | while (count > 2*size) |
| 62 | count >>= 1; | 62 | count >>= 1; |
| 63 | eb = kzalloc(count*sizeof(struct hlist_head) + | 63 | eb = kzalloc(count*sizeof(struct hlist_head) + |