Commit d820ac4c authored by Ingo Molnar's avatar Ingo Molnar
Browse files

locking: rename trace_softirq_[enter|exit] => lockdep_softirq_[enter|exit] 



Impact: cleanup

The naming clashes with upcoming softirq tracepoints, so rename the
APIs to lockdep_*().

Requested-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 3c1f67d6

include/linux/irqflags.h

+4 −4
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ 
# define trace_softirqs_enabled(p)	((p)->softirqs_enabled)

# define trace_hardirq_enter()	do { current->hardirq_context++; } while (0)

# define trace_hardirq_exit()	do { current->hardirq_context--; } while (0)

# define trace_softirq_enter()	do { current->softirq_context++; } while (0)

# define trace_softirq_exit()	do { current->softirq_context--; } while (0)

# define lockdep_softirq_enter()	do { current->softirq_context++; } while (0)

# define lockdep_softirq_exit()	do { current->softirq_context--; } while (0)

# define INIT_TRACE_IRQFLAGS	.softirqs_enabled = 1,

#else

# define trace_hardirqs_on()		do { } while (0)
@@ -38,8 +38,8 @@ 
# define trace_softirqs_enabled(p)	0

# define trace_hardirq_enter()		do { } while (0)

# define trace_hardirq_exit()		do { } while (0)

# define trace_softirq_enter()		do { } while (0)

# define trace_softirq_exit()		do { } while (0)

# define lockdep_softirq_enter()	do { } while (0)

# define lockdep_softirq_exit()		do { } while (0)

# define INIT_TRACE_IRQFLAGS

#endif

kernel/softirq.c

+2 −2
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ asmlinkage void __do_softirq(void) 
	account_system_vtime(current);



	__local_bh_disable((unsigned long)__builtin_return_address(0));

	trace_softirq_enter();

	lockdep_softirq_enter();



	cpu = smp_processor_id();

restart:
@@ -220,7 +220,7 @@ asmlinkage void __do_softirq(void) 
	if (pending)

		wakeup_softirqd();



	trace_softirq_exit();

	lockdep_softirq_exit();



	account_system_vtime(current);

	_local_bh_enable();

lib/locking-selftest.c

+2 −2
Original line number Diff line number Diff line
@@ -157,11 +157,11 @@ static void init_shared_classes(void) 
#define SOFTIRQ_ENTER()				\

		local_bh_disable();		\

		local_irq_disable();		\

		trace_softirq_enter();		\

		lockdep_softirq_enter();	\

		WARN_ON(!in_softirq());



#define SOFTIRQ_EXIT()				\

		trace_softirq_exit();		\

		lockdep_softirq_exit();		\

		local_irq_enable();		\

		local_bh_enable();