locking/lockdep: Cleanup (00b0ed2d) · Commits · 戴 / test

include/linux/irqflags.h

+30 −24

Original line number	Diff line number	Diff line
		@@ -53,6 +53,7 @@ DECLARE_PER_CPU(int, hardirq_context);
		extern void trace_hardirqs_off_finish(void);
		extern void trace_hardirqs_on(void);
		extern void trace_hardirqs_off(void);

		# define lockdep_hardirq_context() (raw_cpu_read(hardirq_context))
		# define lockdep_softirq_context(p) ((p)->softirq_context)
		# define lockdep_hardirqs_enabled() (this_cpu_read(hardirqs_enabled))
		@@ -181,17 +182,25 @@ do { \
		* if !TRACE_IRQFLAGS.
		*/
		#ifdef CONFIG_TRACE_IRQFLAGS

		#define local_irq_enable() \
		do { trace_hardirqs_on(); raw_local_irq_enable(); } while (0)
		do { \
		trace_hardirqs_on(); \
		raw_local_irq_enable(); \
		} while (0)

		#define local_irq_disable() \
		do { raw_local_irq_disable(); trace_hardirqs_off(); } while (0)
		do { \
		raw_local_irq_disable(); \
		trace_hardirqs_off(); \
		} while (0)

		#define local_irq_save(flags) \
		do { \
		raw_local_irq_save(flags); \
		trace_hardirqs_off(); \
		} while (0)


		#define local_irq_restore(flags) \
		do { \
		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_disable() do { raw_local_irq_disable(); } while (0)
		#define local_irq_save(flags) \
		do { \
		raw_local_irq_save(flags); \
		} while (0)
		#define local_irq_save(flags) do { raw_local_irq_save(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)