mirror of
https://github.com/tbsdtv/linux_media.git
synced 2025-07-24 05:01:03 +02:00
locking/lockdep: Cleanup
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org> Reviewed-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Tested-by: Marco Elver <elver@google.com> Link: https://lkml.kernel.org/r/20200821085348.546087214@infradead.org
This commit is contained in:
@@ -49,10 +49,11 @@ struct irqtrace_events {
|
|||||||
DECLARE_PER_CPU(int, hardirqs_enabled);
|
DECLARE_PER_CPU(int, hardirqs_enabled);
|
||||||
DECLARE_PER_CPU(int, hardirq_context);
|
DECLARE_PER_CPU(int, hardirq_context);
|
||||||
|
|
||||||
extern void trace_hardirqs_on_prepare(void);
|
extern void trace_hardirqs_on_prepare(void);
|
||||||
extern void trace_hardirqs_off_finish(void);
|
extern void trace_hardirqs_off_finish(void);
|
||||||
extern void trace_hardirqs_on(void);
|
extern void trace_hardirqs_on(void);
|
||||||
extern void trace_hardirqs_off(void);
|
extern void trace_hardirqs_off(void);
|
||||||
|
|
||||||
# define lockdep_hardirq_context() (raw_cpu_read(hardirq_context))
|
# define lockdep_hardirq_context() (raw_cpu_read(hardirq_context))
|
||||||
# define lockdep_softirq_context(p) ((p)->softirq_context)
|
# define lockdep_softirq_context(p) ((p)->softirq_context)
|
||||||
# define lockdep_hardirqs_enabled() (this_cpu_read(hardirqs_enabled))
|
# define lockdep_hardirqs_enabled() (this_cpu_read(hardirqs_enabled))
|
||||||
@@ -120,17 +121,17 @@ do { \
|
|||||||
#else
|
#else
|
||||||
# define trace_hardirqs_on_prepare() do { } while (0)
|
# define trace_hardirqs_on_prepare() do { } while (0)
|
||||||
# define trace_hardirqs_off_finish() do { } while (0)
|
# define trace_hardirqs_off_finish() do { } while (0)
|
||||||
# define trace_hardirqs_on() do { } while (0)
|
# define trace_hardirqs_on() do { } while (0)
|
||||||
# define trace_hardirqs_off() do { } while (0)
|
# define trace_hardirqs_off() do { } while (0)
|
||||||
# define lockdep_hardirq_context() 0
|
# define lockdep_hardirq_context() 0
|
||||||
# define lockdep_softirq_context(p) 0
|
# define lockdep_softirq_context(p) 0
|
||||||
# define lockdep_hardirqs_enabled() 0
|
# define lockdep_hardirqs_enabled() 0
|
||||||
# define lockdep_softirqs_enabled(p) 0
|
# define lockdep_softirqs_enabled(p) 0
|
||||||
# define lockdep_hardirq_enter() do { } while (0)
|
# define lockdep_hardirq_enter() do { } while (0)
|
||||||
# define lockdep_hardirq_threaded() do { } while (0)
|
# define lockdep_hardirq_threaded() do { } while (0)
|
||||||
# define lockdep_hardirq_exit() do { } while (0)
|
# define lockdep_hardirq_exit() do { } while (0)
|
||||||
# define lockdep_softirq_enter() do { } while (0)
|
# define lockdep_softirq_enter() do { } while (0)
|
||||||
# define lockdep_softirq_exit() do { } while (0)
|
# define lockdep_softirq_exit() do { } while (0)
|
||||||
# define lockdep_hrtimer_enter(__hrtimer) false
|
# define lockdep_hrtimer_enter(__hrtimer) false
|
||||||
# define lockdep_hrtimer_exit(__context) do { } while (0)
|
# define lockdep_hrtimer_exit(__context) do { } while (0)
|
||||||
# define lockdep_posixtimer_enter() do { } while (0)
|
# define lockdep_posixtimer_enter() do { } while (0)
|
||||||
@@ -181,17 +182,25 @@ do { \
|
|||||||
* if !TRACE_IRQFLAGS.
|
* if !TRACE_IRQFLAGS.
|
||||||
*/
|
*/
|
||||||
#ifdef CONFIG_TRACE_IRQFLAGS
|
#ifdef CONFIG_TRACE_IRQFLAGS
|
||||||
#define local_irq_enable() \
|
|
||||||
do { trace_hardirqs_on(); raw_local_irq_enable(); } while (0)
|
#define local_irq_enable() \
|
||||||
#define local_irq_disable() \
|
do { \
|
||||||
do { raw_local_irq_disable(); trace_hardirqs_off(); } while (0)
|
trace_hardirqs_on(); \
|
||||||
|
raw_local_irq_enable(); \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
#define local_irq_disable() \
|
||||||
|
do { \
|
||||||
|
raw_local_irq_disable(); \
|
||||||
|
trace_hardirqs_off(); \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
#define local_irq_save(flags) \
|
#define local_irq_save(flags) \
|
||||||
do { \
|
do { \
|
||||||
raw_local_irq_save(flags); \
|
raw_local_irq_save(flags); \
|
||||||
trace_hardirqs_off(); \
|
trace_hardirqs_off(); \
|
||||||
} while (0)
|
} while (0)
|
||||||
|
|
||||||
|
|
||||||
#define local_irq_restore(flags) \
|
#define local_irq_restore(flags) \
|
||||||
do { \
|
do { \
|
||||||
if (raw_irqs_disabled_flags(flags)) { \
|
if (raw_irqs_disabled_flags(flags)) { \
|
||||||
@@ -214,10 +223,7 @@ do { \
|
|||||||
|
|
||||||
#define local_irq_enable() do { raw_local_irq_enable(); } while (0)
|
#define local_irq_enable() do { raw_local_irq_enable(); } while (0)
|
||||||
#define local_irq_disable() do { raw_local_irq_disable(); } while (0)
|
#define local_irq_disable() do { raw_local_irq_disable(); } while (0)
|
||||||
#define local_irq_save(flags) \
|
#define local_irq_save(flags) do { raw_local_irq_save(flags); } while (0)
|
||||||
do { \
|
|
||||||
raw_local_irq_save(flags); \
|
|
||||||
} while (0)
|
|
||||||
#define local_irq_restore(flags) do { raw_local_irq_restore(flags); } while (0)
|
#define local_irq_restore(flags) do { raw_local_irq_restore(flags); } while (0)
|
||||||
#define safe_halt() do { raw_safe_halt(); } while (0)
|
#define safe_halt() do { raw_safe_halt(); } while (0)
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user