Commit 2d7da80f authored Aug 25, 2008 by Stephen Rothwell Committed by Ingo Molnar Oct 14, 2008

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>

parent 6f93fc07

kernel/trace/ftrace.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -161,8 +161,8 @@ static int __unregister_ftrace_function(struct ftrace_ops *ops)
		* not recorded via the compilation.
		*/
		static DEFINE_SPINLOCK(ftrace_hash_lock);
		#define ftrace_hash_lock(flags) spin_lock_irqsave(ftrace_hash_lock, flags)
		#define ftrace_hash_unlock(flags) spin_lock_irqsave(ftrace_hash_lock, flags)
		#define ftrace_hash_lock(flags) spin_lock_irqsave(&ftrace_hash_lock, flags)
		#define ftrace_hash_unlock(flags) spin_lock_irqsave(&ftrace_hash_lock, flags)
		#else
		/* This is protected via the ftrace_lock with MCOUNT_RECORD. */
		#define ftrace_hash_lock(flags) do { (void)flags; } while (0)

Admin message