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: Peter 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: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
parent
627f364d24
commit
8808a7c654
|
@ -42,13 +42,29 @@ enum {
|
||||||
__LOCKF(USED)
|
__LOCKF(USED)
|
||||||
};
|
};
|
||||||
|
|
||||||
#define LOCKF_ENABLED_IRQ (LOCKF_ENABLED_HARDIRQ | LOCKF_ENABLED_SOFTIRQ)
|
#define LOCKDEP_STATE(__STATE) LOCKF_ENABLED_##__STATE |
|
||||||
#define LOCKF_USED_IN_IRQ (LOCKF_USED_IN_HARDIRQ | LOCKF_USED_IN_SOFTIRQ)
|
static const unsigned long LOCKF_ENABLED_IRQ =
|
||||||
|
#include "lockdep_states.h"
|
||||||
|
0;
|
||||||
|
#undef LOCKDEP_STATE
|
||||||
|
|
||||||
#define LOCKF_ENABLED_IRQ_READ \
|
#define LOCKDEP_STATE(__STATE) LOCKF_USED_IN_##__STATE |
|
||||||
(LOCKF_ENABLED_HARDIRQ_READ | LOCKF_ENABLED_SOFTIRQ_READ)
|
static const unsigned long LOCKF_USED_IN_IRQ =
|
||||||
#define LOCKF_USED_IN_IRQ_READ \
|
#include "lockdep_states.h"
|
||||||
(LOCKF_USED_IN_HARDIRQ_READ | LOCKF_USED_IN_SOFTIRQ_READ)
|
0;
|
||||||
|
#undef LOCKDEP_STATE
|
||||||
|
|
||||||
|
#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,
|
* CONFIG_LOCKDEP_SMALL is defined for sparc. Sparc requires .text,
|
||||||
|
|
Loading…
Reference in New Issue