From patchwork Wed Mar 27 13:04:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lauri Kasanen X-Patchwork-Id: 2350841 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id 016CCDFE82 for ; Wed, 27 Mar 2013 13:57:57 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DC11DE6150 for ; Wed, 27 Mar 2013 06:57:56 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org X-Greylist: delayed 303 seconds by postgrey-1.32 at gabe; Wed, 27 Mar 2013 06:09:56 PDT Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) by gabe.freedesktop.org (Postfix) with ESMTP id 3A403E613D for ; Wed, 27 Mar 2013 06:09:56 -0700 (PDT) Received: from mailout-eu.gmx.com ([10.1.101.212]) by mrigmx.server.lan (mrigmx002) with ESMTP (Nemesis) id 0MdpHH-1U2Lo931h7-00Pd6W for ; Wed, 27 Mar 2013 14:04:52 +0100 Received: (qmail invoked by alias); 27 Mar 2013 13:04:52 -0000 Received: from dsl-jklbrasgw2-54f8b1-169.dhcp.inet.fi (EHLO Valinor) [84.248.177.169] by mail.gmx.com (mp-eu012) with SMTP; 27 Mar 2013 14:04:52 +0100 X-Authenticated: #62935399 X-Provags-ID: V01U2FsdGVkX19n5P5q4+9nfLOD62ixuuUIZJGLkZv5NuyWGnCcsN iUAM3jMPX7Njnh Date: Wed, 27 Mar 2013 15:04:55 +0200 From: Lauri Kasanen To: intel-gfx@lists.freedesktop.org Message-Id: <20130327150455.741f9b00.cand@gmx.com> X-Mailer: Sylpheed 3.1.4 (GTK+ 2.18.6; x86_64-unknown-linux-gnu) Mime-Version: 1.0 X-Y-GMX-Trusted: 0 X-Mailman-Approved-At: Wed, 27 Mar 2013 06:54:37 -0700 Subject: [Intel-gfx] [PATCH] drm/i915: Fix build failure X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org 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: Lauri Kasanen --- 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 3b11ab0..9a48e1a 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) if (eb == NULL) { int size = args->buffer_count; 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) count >>= 1; eb = kzalloc(count*sizeof(struct hlist_head) +