nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

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

Browse source 
Impact: cleanup

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

Requested-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar 2009-03-13 01:30:40 +01:00
parent 3c1f67d60e
commit d820ac4c2f
3 changed files with 8 additions and 8 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

8
include/linux/irqflags.h
View file

@ -24,8 +24,8 @@
# define trace_softirqs_enabled(p) ((p)->softirqs_enabled) # define trace_softirqs_enabled(p) ((p)->softirqs_enabled)
# define trace_hardirq_enter() do { current->hardirq_context++; } while (0) # define trace_hardirq_enter() do { current->hardirq_context++; } while (0)
# define trace_hardirq_exit() 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 lockdep_softirq_enter() do { current->softirq_context++; } while (0)
# define trace_softirq_exit() do { current->softirq_context--; } while (0) # define lockdep_softirq_exit() do { current->softirq_context--; } while (0)
# define INIT_TRACE_IRQFLAGS .softirqs_enabled = 1, # define INIT_TRACE_IRQFLAGS .softirqs_enabled = 1,
#else #else
# define trace_hardirqs_on() do { } while (0) # define trace_hardirqs_on() do { } while (0)
@ -38,8 +38,8 @@
# define trace_softirqs_enabled(p) 0 # define trace_softirqs_enabled(p) 0
# define trace_hardirq_enter() do { } while (0) # define trace_hardirq_enter() do { } while (0)
# define trace_hardirq_exit() do { } while (0) # define trace_hardirq_exit() do { } while (0)
# define trace_softirq_enter() do { } while (0) # define lockdep_softirq_enter() do { } while (0)
# define trace_softirq_exit() do { } while (0) # define lockdep_softirq_exit() do { } while (0)
# define INIT_TRACE_IRQFLAGS # define INIT_TRACE_IRQFLAGS
#endif #endif

4
kernel/softirq.c
View file

@ -180,7 +180,7 @@ asmlinkage void __do_softirq(void)
account_system_vtime(current); account_system_vtime(current);
__local_bh_disable((unsigned long)__builtin_return_address(0)); __local_bh_disable((unsigned long)__builtin_return_address(0));
trace_softirq_enter(); lockdep_softirq_enter();
cpu = smp_processor_id(); cpu = smp_processor_id();
restart: restart:
@ -220,7 +220,7 @@ asmlinkage void __do_softirq(void)
if (pending) if (pending)
wakeup_softirqd(); wakeup_softirqd();
trace_softirq_exit(); lockdep_softirq_exit();
account_system_vtime(current); account_system_vtime(current);
_local_bh_enable(); _local_bh_enable();

4
lib/locking-selftest.c
View file

@ -157,11 +157,11 @@ static void init_shared_classes(void)
#define SOFTIRQ_ENTER() \ #define SOFTIRQ_ENTER() \
local_bh_disable(); \ local_bh_disable(); \
local_irq_disable(); \ local_irq_disable(); \
trace_softirq_enter(); \ lockdep_softirq_enter(); \
WARN_ON(!in_softirq()); WARN_ON(!in_softirq());
#define SOFTIRQ_EXIT() \ #define SOFTIRQ_EXIT() \
trace_softirq_exit(); \ lockdep_softirq_exit(); \
local_irq_enable(); \ local_irq_enable(); \
local_bh_enable(); local_bh_enable();