From patchwork Fri Mar 10 09:03:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9615203 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2D3CF60414 for ; Fri, 10 Mar 2017 09:03:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2230328702 for ; Fri, 10 Mar 2017 09:03:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1722A28711; Fri, 10 Mar 2017 09:03:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9963328702 for ; Fri, 10 Mar 2017 09:03:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 515BE6EDC7; Fri, 10 Mar 2017 09:03:21 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wr0-x242.google.com (mail-wr0-x242.google.com [IPv6:2a00:1450:400c:c0c::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 980786EDC7 for ; Fri, 10 Mar 2017 09:03:20 +0000 (UTC) Received: by mail-wr0-x242.google.com with SMTP id u48so10793020wrc.1 for ; Fri, 10 Mar 2017 01:03:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id; bh=snaSxTlb1BJ5Llf1i+MFKt3nrtqI438R/Ys5RyMDCP0=; b=USAkE1kjj+PazzeLg57GTyeIktlQCFk9lx8iH2I+VuPPORfdj+GYLwJIn1FKseNUzW fJs38pWlRWeEuIeMJwstnOlzeqgeGHKOuGsAv6b9DRQzcmq879E4InjBFsOGEW/kN973 Qw2cb4NcCsSujMMVlSNEg327xQhvw69igxJFb/FrHyBiGPcyqdKHR3EG//XMMjGSlWpJ ROk/RDHwYQB+4hioxdHQKFvE8srWv0mNQXlIKxIeSmSUOMlXh8/QTqnOv51o5cmbjNxk +7ZZOibCFAMv5cRr1kDWCN1JM5EeHRS9Qbb506d/oZOAynLevZU80DIDA4axGRQzpxPl pLmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id; bh=snaSxTlb1BJ5Llf1i+MFKt3nrtqI438R/Ys5RyMDCP0=; b=T6w47W4w0khtoA9iduabAGLCTuclWOHLNbM4CvrOov3OnwmIkpkvf5IrhHmR68R3+z qsMU3HG4Ug9v9r5DCSDYdlRLg4Hs35rP3fVKUUxrgk+HQWR17kCWX2EGqlow7WRc0r9f 3lAXNgpvHOfP69O7K+J+tfAXDMzBMVeElOk5ipvXJ9a9vviY86wYZcs/jYdYK4avT/0I DahNG8U9FwC6NeSW9ZqeVlFC6aCPr2zcbhIn2ijjfUGDWXhx9LnZbPcDpGzD0/cZVez3 Tw7y7TYQnl+EeH3zj8T/ct7GuMU35nOBrmWxJBZXcuAddISjfrRaIgfnxQ0wFhPmZxfY o1Yw== X-Gm-Message-State: AMke39l+JVNAniZsKw2OBK58vXI5HGpQAjKTRrTwFd8jMunZgXYUT331Xn+rYhLxKgs+5A== X-Received: by 10.223.145.97 with SMTP id j88mr14352143wrj.178.1489136599072; Fri, 10 Mar 2017 01:03:19 -0800 (PST) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id s26sm11876339wra.66.2017.03.10.01.03.18 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Mar 2017 01:03:18 -0800 (PST) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Fri, 10 Mar 2017 09:03:14 +0000 Message-Id: <20170310090314.3142-1-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.11.0 Subject: [Intel-gfx] [CI] drivers/gpu/drm/i915/selftests/i915_selftest.c: fix build with gcc-4.4.4 X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP From: Andrew Morton gcc-4.4.4 has issues with anonymous union initializers. In file included from drivers/gpu/drm/i915/selftests/i915_selftest.c:68: drivers/gpu/drm/i915/selftests/i915_mock_selftests.h:11: error: unknown field 'mock' specified in initializer drivers/gpu/drm/i915/selftests/i915_mock_selftests.h:11: warning: missing braces around initializer drivers/gpu/drm/i915/selftests/i915_mock_selftests.h:11: warning: (near initialization for 'mock_selftests[0].') drivers/gpu/drm/i915/selftests/i915_mock_selftests.h:12: error: unknown field 'mock' specified in initializer drivers/gpu/drm/i915/selftests/i915_mock_selftests.h:13: error: unknown field 'm ... Work around this. Cc: Chris Wilson Signed-off-by: Andrew Morton Reviewed-by: Chris Wilson Signed-off-by: Chris Wilson --- drivers/gpu/drm/i915/selftests/i915_selftest.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/selftests/i915_selftest.c b/drivers/gpu/drm/i915/selftests/i915_selftest.c index 6ba3abb10c6f..addc5a599c4a 100644 --- a/drivers/gpu/drm/i915/selftests/i915_selftest.c +++ b/drivers/gpu/drm/i915/selftests/i915_selftest.c @@ -63,13 +63,13 @@ struct selftest { }; }; -#define selftest(n, f) [mock_##n] = { .name = #n, .mock = f }, +#define selftest(n, f) [mock_##n] = { .name = #n, { .mock = f } }, static struct selftest mock_selftests[] = { #include "i915_mock_selftests.h" }; #undef selftest -#define selftest(n, f) [live_##n] = { .name = #n, .live = f }, +#define selftest(n, f) [live_##n] = { .name = #n, { .live = f } }, static struct selftest live_selftests[] = { #include "i915_live_selftests.h" };