diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-08-24 23:08:44 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-14 04:36:06 -0400 |
| commit | 2d7da80f7138c4276ef4fa0334be400b805d0fbf (patch) | |
| tree | 2c2c21758498c989cf22414bf66bff1093edd263 /kernel | |
| parent | 6f93fc076a464bfe24e8d4c5fea3f6ca5bdb264d (diff) | |
ftrace: fix build failure
After disabling FTRACE_MCOUNT_RECORD via a patch, a dormant build
failure surfaced:
kernel/trace/ftrace.c: In function 'ftrace_record_ip':
kernel/trace/ftrace.c:416: error: incompatible type for argument 1 of '_spin_lock_irqsave'
kernel/trace/ftrace.c:433: error: incompatible type for argument 1 of '_spin_lock_irqsave'
Introduced by commit 6dad8e07f4c10b17b038e84d29f3ca41c2e55cd0 ("ftrace:
add necessary locking for ftrace records").
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/trace/ftrace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 43665add9805..7599abdf6d4d 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c | |||
| @@ -161,8 +161,8 @@ static int __unregister_ftrace_function(struct ftrace_ops *ops) | |||
| 161 | * not recorded via the compilation. | 161 | * not recorded via the compilation. |
| 162 | */ | 162 | */ |
| 163 | static DEFINE_SPINLOCK(ftrace_hash_lock); | 163 | static DEFINE_SPINLOCK(ftrace_hash_lock); |
| 164 | #define ftrace_hash_lock(flags) spin_lock_irqsave(ftrace_hash_lock, flags) | 164 | #define ftrace_hash_lock(flags) spin_lock_irqsave(&ftrace_hash_lock, flags) |
| 165 | #define ftrace_hash_unlock(flags) spin_lock_irqsave(ftrace_hash_lock, flags) | 165 | #define ftrace_hash_unlock(flags) spin_lock_irqsave(&ftrace_hash_lock, flags) |
| 166 | #else | 166 | #else |
| 167 | /* This is protected via the ftrace_lock with MCOUNT_RECORD. */ | 167 | /* This is protected via the ftrace_lock with MCOUNT_RECORD. */ |
| 168 | #define ftrace_hash_lock(flags) do { (void)flags; } while (0) | 168 | #define ftrace_hash_lock(flags) do { (void)flags; } while (0) |