From 188540137a74980ae2f52092e82c01b35fbc5ed5 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Thu, 9 Mar 2017 15:47:37 -0800 Subject: [PATCH] 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. Fixes: 953c7f82eb89 ("drm/i915: Provide a hook for selftests") Cc: Chris Wilson Signed-off-by: Andrew Morton Reviewed-by: Chris Wilson Link: http://patchwork.freedesktop.org/patch/msgid/20170310090314.3142-1-chris@chris-wilson.co.uk 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" }; -- 2.45.2