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

Commit 18854013 authored by Andrew Morton's avatar Andrew Morton Committed by Chris Wilson
Browse files

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].<anonymous>')
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: 953c7f82 ("drm/i915: Provide a hook for selftests")
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/20170310090314.3142-1-chris@chris-wilson.co.uk


Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent cbf4b77a

drivers/gpu/drm/i915/selftests/i915_selftest.c

+2 −2
Original line number Diff line number Diff line
@@ -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"

};