On Tue, Nov 08, 2016 at 02:49:05PM +0000, Chris Wilson wrote: > On Tue, Nov 08, 2016 at 02:58:17PM +0100, Arnd Bergmann wrote: > > The newly added assert_kernel_context_is_current introduces a warning > > when built with W=1: > > > > drivers/gpu/drm/i915/i915_gem.c: In function > > âassert_kernel_context_is_currentâ: > > drivers/gpu/drm/i915/i915_gem.c:4417:63: error: suggest braces around empty > > body in an âelseâ statement [-Werror=empty-body] > > > > Changing the GEM_BUG_ON() macro from an empty definition to "do { } while > > (0)" > > makes the macro more robust to use and avoids the warning. > > > > Fixes: 3033acab07f9 ("drm/i915: Queue the idling context switch after all > > other timelines") > > Signed-off-by: Arnd Bergmann <arnd at arndb.de> > Reviewed-by: Chris Wilson <chris at chris-wilson.co.uk>
Queued for -next, thanks for the patch. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch