From patchwork Thu Mar 9 23:47:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 9615197 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 3DFAF60415 for ; Fri, 10 Mar 2017 08:38:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 29353286EB for ; Fri, 10 Mar 2017 08:38:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1C25028703; Fri, 10 Mar 2017 08:38:35 +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.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED 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 11AB6286EB for ; Fri, 10 Mar 2017 08:38:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F0F086EDBB; Fri, 10 Mar 2017 08:38:31 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from fireflyinternet.com (mail.fireflyinternet.com [109.228.58.192]) by gabe.freedesktop.org (Postfix) with ESMTPS id 69BA56EDBB for ; Fri, 10 Mar 2017 08:38:30 +0000 (UTC) X-Default-Received-SPF: pass (skip=forwardok (res=PASS)) x-ip-name=78.156.65.138; Received: from nuc-i3427.alporthouse.com (unverified [78.156.65.138]) by fireflyinternet.com (Firefly Internet (M1)) with ESMTP id 5803796-1500050 for ; Fri, 10 Mar 2017 08:38:25 +0000 Received: by nuc-i3427.alporthouse.com (sSMTP sendmail emulation); Fri, 10 Mar 2017 08:38:25 +0000 Resent-From: Chris Wilson Resent-Date: Fri, 10 Mar 2017 08:38:25 +0000 Resent-Message-ID: <20170310083825.GK28427@nuc-i3427.alporthouse.com> Resent-To: intel-gfx@lists.freedesktop.org X-Default-Received-SPF: pass (skip=g_gateway_allow (res=PASS)) x-ip-name=52.211.27.78; Received: from mail.fireflyinternet.com [109.228.58.192] by nuc-i3427 with POP3 (fetchmail-6.3.26) for (single-drop); Thu, 09 Mar 2017 23:51:49 +0000 (GMT) Received: from spamshield.firefly-cloud.com (unverified [52.211.27.78]) by fireflyinternet.com (Firefly Internet (M1)) with ESMTP id 5800090-1500050 for ; Thu, 09 Mar 2017 23:48:08 +0000 Received: from localhost (localhost [127.0.0.1]) by spamshield.firefly-cloud.com (Postfix) with ESMTP id 1836DA92FA for ; Thu, 9 Mar 2017 23:48:07 +0000 (GMT) X-Virus-Scanned: by SpamTitan at eu-west-1.compute.internal Received: from spamshield.firefly-cloud.com (localhost [127.0.0.1]) by spamshield.firefly-cloud.com (Postfix) with ESMTP id 4A7CBA92D6 for ; Thu, 9 Mar 2017 23:48:06 +0000 (GMT) Received-SPF: pass (svcemlmxl05.srs.netnames.net: 185.26.230.69 is authorized to use 'SRS0+86eecad79812b3818029+4946+linux-foundation.org+akpm@svcemlmxl05.srs.netnames.net' in 'mfrom' identity (mechanism 'ip4:185.26.230.64/26' matched)) receiver=spamshield.firefly-cloud.com; identity=mailfrom; envelope-from="SRS0+86eecad79812b3818029+4946+linux-foundation.org+akpm@svcemlmxl05.srs.netnames.net"; helo=svcemlmxl05.netnames.net; client-ip=185.26.230.69 Received: from svcemlmxl05.netnames.net (svcemlmxl05.netnames.net [185.26.230.69]) by spamshield.firefly-cloud.com (Postfix) with ESMTP id 3C5E5A92B2 for ; Thu, 9 Mar 2017 23:48:05 +0000 (GMT) Received: from mail.linuxfoundation.org ([140.211.169.12]:38410) by svcemlmxl05.netnames.net with esmtp (NBT 4.72 1) id 1cm7mu-0000Yy-Le for chris@chris-wilson.co.uk; Thu, 09 Mar 2017 23:48:04 +0000 Received: from akpm3.mtv.corp.google.com (unknown [104.132.1.73]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id BFCC3415; Thu, 9 Mar 2017 23:47:37 +0000 (UTC) Received-SPF: pass (svcemlmxl05.netnames.net: domain of linux-foundation.org designates 140.211.169.12 as permitted sender) client-ip=140.211.169.12; envelope-from=akpm@linux-foundation.org; helo=mail.linuxfoundation.org; Date: Thu, 09 Mar 2017 15:47:37 -0800 From: akpm@linux-foundation.org To: chris@chris-wilson.co.uk, akpm@linux-foundation.org Message-ID: <58c1e999.UDEsRhvmiCcX/WNK%akpm@linux-foundation.org> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 X-Originally-To: chris@chris-wilson.co.uk X-SRS-Rewrite: SMTP reverse-path rewritten from by svcemlmxl05.netnames.net X-To-Not-Matched: true X-Rcpt-To: X-FriendScore: : 0.0 sd=0.0 Close nspam=0 nok=2 0.00 $0.10(X-myrbl:Color=yellow) $0.10(X-Phrase:clean) $0.15(X-SpamContent:clean) $0.79(From isn't in return path) $0.39(X-NotAscii:us-ascii) $0.53(X-To-Not-Matched:true) X-NotAscii: charset=us-ascii X-SpamContent: Clean X-Probe: +OK skipped, known ip address X-Phrase: Clean score=0.00 X-Avast: GetHandleFailed X-X-MyRbl: Color=Yellow Age=0 Spam=2 Notspam=0 Stars=74 Good=9920 Friend=4332 Surbl=39 Catch=0 r=0.013 ip=52.211.27.78 X-IP-stats: Isspam GreyPassed Notspam Incoming Last 0, First 183, in=1509091, out=0, spam=268 Known=true ip=52.211.27.78 X-To-Not-Matched: true Subject: [Intel-gfx] [patch 1/1] 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP From: Andrew Morton Subject: drivers/gpu/drm/i915/selftests/i915_selftest.c: fix build with gcc-4.4.4 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 --- drivers/gpu/drm/i915/selftests/i915_selftest.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN drivers/gpu/drm/i915/selftests/i915_selftest.c~drivers-gpu-drm-i915-selftests-i915_selftestc-fix-build-with-gcc-444 drivers/gpu/drm/i915/selftests/i915_selftest.c --- a/drivers/gpu/drm/i915/selftests/i915_selftest.c~drivers-gpu-drm-i915-selftests-i915_selftestc-fix-build-with-gcc-444 +++ a/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" };