The following commit has been merged into the locking/core branch of tip: Commit-ID: f7427ba5ce9c5438ad392b6cbcc4ca8a0487d7e7 Gitweb: https://git.kernel.org/tip/f7427ba5ce9c5438ad392b6cbcc4ca8a0487d7e7 Author: Shaokun Zhang <zhangshaokun@xxxxxxxxxxxxx> AuthorDate: Wed, 25 Aug 2021 15:07:04 +08:00 Committer: Peter Zijlstra <peterz@xxxxxxxxxxxxx> CommitterDate: Fri, 17 Sep 2021 15:08:45 +02:00 locking/lockdep: Cleanup the repeated declaration 'struct task_struct' has been decleared twice, so keep the top one and cleanup the repeated one. Signed-off-by: Shaokun Zhang <zhangshaokun@xxxxxxxxxxxxx> Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx> Link: https://lkml.kernel.org/r/1629875224-32751-1-git-send-email-zhangshaokun@xxxxxxxxxxxxx --- include/linux/debug_locks.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/linux/debug_locks.h b/include/linux/debug_locks.h index 3f49e65..dbb409d 100644 --- a/include/linux/debug_locks.h +++ b/include/linux/debug_locks.h @@ -47,8 +47,6 @@ extern int debug_locks_off(void); # define locking_selftest() do { } while (0) #endif -struct task_struct; - #ifdef CONFIG_LOCKDEP extern void debug_show_all_locks(void); extern void debug_show_held_locks(struct task_struct *task);