← Back to branch summary

~ubuntu-branches/debian/experimental/linux-tools/experimental

« back to all changes in this revision

Viewing changes to include/linux/tracepoint.h

  • Committer: Package Import Robot
  • Author(s): Ben Hutchings
  • Date: 2014-02-02 16:57:49 UTC
  • mfrom: (1.1.10) (0.1.21 sid)
  • Revision ID: package-import@ubuntu.com-20140202165749-tw94o9t1t0a8txk6
Tags: 3.13-1~exp2
Merge changes from sid up to 3.12.6-3

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/linux/tracepoint.h
267
267
 
268
268
#define TRACE_EVENT_FLAGS(event, flag)
269
269
 
 
270
#define TRACE_EVENT_PERF_PERM(event, expr...)
 
271
 
270
272
#endif /* DECLARE_TRACE */
271
273
 
272
274
#ifndef TRACE_EVENT
399
401
 
400
402
#define TRACE_EVENT_FLAGS(event, flag)
401
403
 
 
404
#define TRACE_EVENT_PERF_PERM(event, expr...)
 
405
 
402
406
#endif /* ifdef TRACE_EVENT (see note above) */