On Tue, Jun 25, 2019 at 01:46:07AM -0700, tip-bot for Arnd Bergmann wrote: > Commit-ID: 886532aee3cd42d95196601ed16d7c3d4679e9e5 > Gitweb: > https://git.kernel.org/tip/886532aee3cd42d95196601ed16d7c3d4679e9e5 > Author: Arnd Bergmann <[email protected]> > AuthorDate: Mon, 17 Jun 2019 14:47:05 +0200 > Committer: Ingo Molnar <[email protected]> > CommitDate: Tue, 25 Jun 2019 10:17:07 +0200 > > locking/lockdep: Move mark_lock() inside CONFIG_TRACE_IRQFLAGS && > CONFIG_PROVE_LOCKING > > The last cleanup patch triggered another issue, as now another function > should be moved into the same section: > > kernel/locking/lockdep.c:3580:12: error: 'mark_lock' defined but not used > [-Werror=unused-function] > static int mark_lock(struct task_struct *curr, struct held_lock *this, > > Move mark_lock() into the same #ifdef section as its only caller, and > remove the now-unused mark_lock_irq() stub helper. > > Signed-off-by: Arnd Bergmann <[email protected]> > Signed-off-by: Peter Zijlstra (Intel) <[email protected]> > Cc: Andrew Morton <[email protected]> > Cc: Bart Van Assche <[email protected]> > Cc: Frederic Weisbecker <[email protected]> > Cc: Linus Torvalds <[email protected]> > Cc: Paul E. McKenney <[email protected]> > Cc: Peter Zijlstra <[email protected]> > Cc: Thomas Gleixner <[email protected]> > Cc: Waiman Long <[email protected]> > Cc: Will Deacon <[email protected]> > Cc: Yuyang Du <[email protected]> > Fixes: 0d2cc3b34532 ("locking/lockdep: Move valid_state() inside > CONFIG_TRACE_IRQFLAGS && CONFIG_PROVE_LOCKING") > Link: https://lkml.kernel.org/r/[email protected] > Signed-off-by: Ingo Molnar <[email protected]> > --- > kernel/locking/lockdep.c | 73 > ++++++++++++++++++++++-------------------------- > 1 file changed, 34 insertions(+), 39 deletions(-)
Hmm, I was hoping we could fold in the simplification that Arnd came up with yesterday: https://lkml.kernel.org/r/CAK8P3a2X_5p9QOKG-jcozR4P8iPNJAY2ObXgfqt=bbd+hzd...@mail.gmail.com Will
