linux-next: build failure after merge of the drm-intel tree

[Stephen Rothwell]

Hi all,

After merging the drm-intel tree, today's linux-next build (x86_64
allmodconfig) failed like this:

In file included from include/trace/define_trace.h:90:0,
                 from drivers/gpu/drm/i915/i915_trace.h:520,
                 from drivers/gpu/drm/i915/i915_trace_points.c:12:
drivers/gpu/drm/i915/./i915_trace.h: In function 'ftrace_raw_event_i915_gem_evict_vm':
drivers/gpu/drm/i915/./i915_trace.h:246:22: error: 'dev' undeclared (first use in this function)
       __entry->dev = dev->primary->index;
                      ^
include/trace/ftrace.h:574:4: note: in definition of macro 'DECLARE_EVENT_CLASS'
  { assign; }       \
    ^
include/trace/ftrace.h:36:9: note: in expansion of macro 'PARAMS'
         PARAMS(assign),         \
         ^
drivers/gpu/drm/i915/./i915_trace.h:236:1: note: in expansion of macro 'TRACE_EVENT'
 TRACE_EVENT(i915_gem_evict_vm,
 ^
drivers/gpu/drm/i915/./i915_trace.h:245:6: note: in expansion of macro 'TP_fast_assign'
      TP_fast_assign(
      ^
drivers/gpu/drm/i915/./i915_trace.h:246:22: note: each undeclared identifier is reported only once for each function it appears in
       __entry->dev = dev->primary->index;
                      ^
include/trace/ftrace.h:574:4: note: in definition of macro 'DECLARE_EVENT_CLASS'
  { assign; }       \
    ^
include/trace/ftrace.h:36:9: note: in expansion of macro 'PARAMS'
         PARAMS(assign),         \
         ^
drivers/gpu/drm/i915/./i915_trace.h:236:1: note: in expansion of macro 'TRACE_EVENT'
 TRACE_EVENT(i915_gem_evict_vm,
 ^
drivers/gpu/drm/i915/./i915_trace.h:245:6: note: in expansion of macro 'TP_fast_assign'
      TP_fast_assign(
      ^
In file included from include/trace/define_trace.h:90:0,
                 from drivers/gpu/drm/i915/i915_trace.h:520,
                 from drivers/gpu/drm/i915/i915_trace_points.c:12:
drivers/gpu/drm/i915/./i915_trace.h: In function 'perf_trace_i915_gem_evict_vm':
drivers/gpu/drm/i915/./i915_trace.h:246:22: error: 'dev' undeclared (first use in this function)
       __entry->dev = dev->primary->index;
                      ^
include/trace/ftrace.h:708:4: note: in definition of macro 'DECLARE_EVENT_CLASS'
  { assign; }       \
    ^
include/trace/ftrace.h:36:9: note: in expansion of macro 'PARAMS'
         PARAMS(assign),         \
         ^
drivers/gpu/drm/i915/./i915_trace.h:236:1: note: in expansion of macro 'TRACE_EVENT'
 TRACE_EVENT(i915_gem_evict_vm,
 ^
drivers/gpu/drm/i915/./i915_trace.h:245:6: note: in expansion of macro 'TP_fast_assign'
      TP_fast_assign(
      ^

Caused by commit a25ca17c1eac ("drm/i915: Do not dereference pointers
from ring buffer in evict event").

I have used the drm-intel tree from next-20140318 for today.

-- 
Cheers,
Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>

Attachment: pgpI8dDED8NqE.pgp
Description: PGP signature