Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 169587
b: refs/heads/master
c: 6717876
h: refs/heads/master
i:
  169585: b5fa1e3
  169583: 4b5e326
v: v3
  • Loading branch information
Frederic Weisbecker authored and Ingo Molnar committed Nov 13, 2009
1 parent c8ffdf2 commit d672a14
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: db48cccc7c709ccfa7cb4ac702bc27c216bffee7
refs/heads/master: 67178767b936fb47a3a5e88097cff41ccbda7acb
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#undef TRACE_SYSTEM
#define TRACE_SYSTEM lockdep
#define TRACE_SYSTEM lock

#if !defined(_TRACE_LOCKDEP_H) || defined(TRACE_HEADER_MULTI_READ)
#define _TRACE_LOCKDEP_H
#if !defined(_TRACE_LOCK_H) || defined(TRACE_HEADER_MULTI_READ)
#define _TRACE_LOCK_H

#include <linux/lockdep.h>
#include <linux/tracepoint.h>
Expand Down Expand Up @@ -90,7 +90,7 @@ TRACE_EVENT(lock_acquired,
#endif
#endif

#endif /* _TRACE_LOCKDEP_H */
#endif /* _TRACE_LOCK_H */

/* This part must be outside protection */
#include <trace/define_trace.h>
2 changes: 1 addition & 1 deletion trunk/kernel/lockdep.c
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
#include "lockdep_internals.h"

#define CREATE_TRACE_POINTS
#include <trace/events/lockdep.h>
#include <trace/events/lock.h>

#ifdef CONFIG_PROVE_LOCKING
int prove_locking = 1;
Expand Down

0 comments on commit d672a14

Please sign in to comment.