SPDX-License-Identifier: GPL-2.0 aufs5.3.16 lockdep patch diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h index 12d18e1803486..2dec42066e7a7 100644 --- a/include/linux/lockdep.h +++ b/include/linux/lockdep.h @@ -17,7 +17,7 @@ struct lockdep_map; extern int prove_locking; extern int lock_stat; -#define MAX_LOCKDEP_SUBCLASSES 8UL +#define MAX_LOCKDEP_SUBCLASSES (8UL + 4) #include diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c index 739d1c8a81f5b..b849601b2b139 100644 --- a/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c diff --git a/kernel/locking/lockdep_internals.h b/kernel/locking/lockdep_internals.h index cc83568d50125..68a74964daa1a 100644 --- a/kernel/locking/lockdep_internals.h +++ b/kernel/locking/lockdep_internals.h @@ -93,15 +93,15 @@ static const unsigned long LOCKF_USED_IN_IRQ_READ = #define MAX_LOCKDEP_CHAINS_BITS 15 #define MAX_STACK_TRACE_ENTRIES 262144UL #else -#define MAX_LOCKDEP_ENTRIES 32768UL +#define MAX_LOCKDEP_ENTRIES (32768UL << 5) -#define MAX_LOCKDEP_CHAINS_BITS 16 +#define MAX_LOCKDEP_CHAINS_BITS (16 + 5) /* * Stack-trace: tightly packed array of stack backtrace * addresses. Protected by the hash_lock. */ -#define MAX_STACK_TRACE_ENTRIES 524288UL +#define MAX_STACK_TRACE_ENTRIES (524288UL << 5) #endif #define MAX_LOCKDEP_CHAINS (1UL << MAX_LOCKDEP_CHAINS_BITS)