Commit 8808a7c6 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

locking/lockdep: Generate LOCKF_ bit composites 



Instead of open-coding the bitmasks, generate them using the
lockdep_states.h header.

This prepares for additional states, which would make the manual masks
tedious and error prone.

Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 627f364d

kernel/locking/lockdep_internals.h

+22 −6
Original line number Diff line number Diff line
@@ -42,13 +42,29 @@ enum { 
	__LOCKF(USED)

};



#define LOCKF_ENABLED_IRQ (LOCKF_ENABLED_HARDIRQ | LOCKF_ENABLED_SOFTIRQ)

#define LOCKF_USED_IN_IRQ (LOCKF_USED_IN_HARDIRQ | LOCKF_USED_IN_SOFTIRQ)

#define LOCKDEP_STATE(__STATE)	LOCKF_ENABLED_##__STATE |

static const unsigned long LOCKF_ENABLED_IRQ =

#include "lockdep_states.h"

	0;

#undef LOCKDEP_STATE



#define LOCKDEP_STATE(__STATE)	LOCKF_USED_IN_##__STATE |

static const unsigned long LOCKF_USED_IN_IRQ =

#include "lockdep_states.h"

	0;

#undef LOCKDEP_STATE



#define LOCKF_ENABLED_IRQ_READ \

		(LOCKF_ENABLED_HARDIRQ_READ | LOCKF_ENABLED_SOFTIRQ_READ)

#define LOCKF_USED_IN_IRQ_READ \

		(LOCKF_USED_IN_HARDIRQ_READ | LOCKF_USED_IN_SOFTIRQ_READ)

#define LOCKDEP_STATE(__STATE)	LOCKF_ENABLED_##__STATE##_READ |

static const unsigned long LOCKF_ENABLED_IRQ_READ =

#include "lockdep_states.h"

	0;

#undef LOCKDEP_STATE



#define LOCKDEP_STATE(__STATE)	LOCKF_USED_IN_##__STATE##_READ |

static const unsigned long LOCKF_USED_IN_IRQ_READ =

#include "lockdep_states.h"

	0;

#undef LOCKDEP_STATE



/*

 * CONFIG_LOCKDEP_SMALL is defined for sparc. Sparc requires .text,

CRA Git | Maintained and supported by SUSTech CRA and CCSE