Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27b7c63a authored by Lauri Kasanen's avatar Lauri Kasanen Committed by Daniel Vetter
Browse files

drm/i915: Fix build failure 

ERROR: "__build_bug_on_failed" [drivers/gpu/drm/i915/i915.ko] undefined!

Originally reported at http://www.gossamer-threads.com/lists/linux/kernel/1631803


FDO bug #62775

This needs to be backported to both 3.7 and 3.8 stable trees. Doesn't apply straight,
but it's a quick change.

Signed-off-by: default avatarLauri Kasanen <cand@gmx.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=62775


Cc: stable@vger.kernel.org
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 637f44d2

drivers/gpu/drm/i915/i915_gem_execbuffer.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -57,7 +57,7 @@ eb_create(struct drm_i915_gem_execbuffer2 *args) 
	if (eb == NULL) {

	if (eb == NULL) {

		int size = args->buffer_count;

		int size = args->buffer_count;

		int count = PAGE_SIZE / sizeof(struct hlist_head) / 2;

		int count = PAGE_SIZE / sizeof(struct hlist_head) / 2;

		BUILD_BUG_ON(!is_power_of_2(PAGE_SIZE / sizeof(struct hlist_head)));

		BUILD_BUG_ON_NOT_POWER_OF_2(PAGE_SIZE / sizeof(struct hlist_head));

		while (count > 2*size)

		while (count > 2*size)

			count >>= 1;

			count >>= 1;

		eb = kzalloc(count*sizeof(struct hlist_head) +

		eb = kzalloc(count*sizeof(struct hlist_head) +