Commit bd27cfb5 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Boqun Feng
Browse files

locking/lockdep: Change 'static const' variables to enum values 



gcc warns about 'static const' variables even in headers when building
with -Wunused-const-variables enabled:

In file included from kernel/locking/lockdep_proc.c:25:
kernel/locking/lockdep_internals.h:69:28: error: 'LOCKF_USED_IN_IRQ_READ' defined but not used [-Werror=unused-const-variable=]
   69 | static const unsigned long LOCKF_USED_IN_IRQ_READ =
      |                            ^~~~~~~~~~~~~~~~~~~~~~
kernel/locking/lockdep_internals.h:63:28: error: 'LOCKF_ENABLED_IRQ_READ' defined but not used [-Werror=unused-const-variable=]
   63 | static const unsigned long LOCKF_ENABLED_IRQ_READ =
      |                            ^~~~~~~~~~~~~~~~~~~~~~
kernel/locking/lockdep_internals.h:57:28: error: 'LOCKF_USED_IN_IRQ' defined but not used [-Werror=unused-const-variable=]
   57 | static const unsigned long LOCKF_USED_IN_IRQ =
      |                            ^~~~~~~~~~~~~~~~~
kernel/locking/lockdep_internals.h:51:28: error: 'LOCKF_ENABLED_IRQ' defined but not used [-Werror=unused-const-variable=]
   51 | static const unsigned long LOCKF_ENABLED_IRQ =
      |                            ^~~~~~~~~~~~~~~~~

This one is easy to avoid by changing the generated constant definition
into an equivalent enum.

Tested-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarBoqun Feng <boqun.feng@gmail.com>
Link: https://lore.kernel.org/r/20250409122314.2848028-6-arnd@kernel.org
parent d7c36d63

kernel/locking/lockdep_internals.h

+10 −8
Original line number Diff line number Diff line
@@ -47,29 +47,31 @@ enum { 
	__LOCKF(USED_READ)

};



enum {

#define LOCKDEP_STATE(__STATE)	LOCKF_ENABLED_##__STATE |

static const unsigned long LOCKF_ENABLED_IRQ =

	LOCKF_ENABLED_IRQ =

#include "lockdep_states.h"

	0;

	0,

#undef LOCKDEP_STATE



#define LOCKDEP_STATE(__STATE)	LOCKF_USED_IN_##__STATE |

static const unsigned long LOCKF_USED_IN_IRQ =

	LOCKF_USED_IN_IRQ =

#include "lockdep_states.h"

	0;

	0,

#undef LOCKDEP_STATE



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

static const unsigned long LOCKF_ENABLED_IRQ_READ =

	LOCKF_ENABLED_IRQ_READ =

#include "lockdep_states.h"

	0;

	0,

#undef LOCKDEP_STATE



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

static const unsigned long LOCKF_USED_IN_IRQ_READ =

	LOCKF_USED_IN_IRQ_READ =

#include "lockdep_states.h"

	0;

	0,

#undef LOCKDEP_STATE

};



#define LOCKF_ENABLED_IRQ_ALL (LOCKF_ENABLED_IRQ | LOCKF_ENABLED_IRQ_READ)

#define LOCKF_USED_IN_IRQ_ALL (LOCKF_USED_IN_IRQ | LOCKF_USED_IN_IRQ_READ)