Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp2359787pxb; Fri, 17 Sep 2021 08:07:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxwmxr6YXOn9LZ3Cd2gnb5jMsi6sVzJusiyRqcz3ScWtf7KEW10PftCEPNaetjLZ7D7RtdN X-Received: by 2002:a05:6638:bc1:: with SMTP id g1mr3483366jad.86.1631891238653; Fri, 17 Sep 2021 08:07:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631891238; cv=none; d=google.com; s=arc-20160816; b=UjNjPKkq8ORxSPTKd6wEgq58BuBw1xSg2sozvYV1Nr/M66VdijzwRM8S/InBfQgHY5 sr9mZnfYTwqO8pkkzVVxd0PuULR1JS0XyEg3XIeaz2vCE1CypdDWYGz0+YQ9a/ElNgMh ziWUo2g7DxtNeE/uXQyOJgsafUKdcaOfOGpR6X7c3cV/e25NwG6iGO+YDQ9KnhXryGcg zXROB2vmx0BkNR/ZoVDdXDPhUe55LoYoxpJ9hwr43wHjJXLc5DsTW2GgztNCCF9lS5W3 2c0G11T7drR3Xn52y1mB0nEt1RDVdPUy7FdlpeJ9wS2vIt6b53UrH5pfVzYjaudOwSj8 Em4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=wVT6FtipNzvGbKA/mqO+GFWba2iEJpsvKM+7syl6gBA=; b=BPuBANLN59kgXc/9Zgf7mRqTJ6OMLMLkJ40fhh2QL7kVmtpqUoEbq9u0vLhbScyavd yXCgy2Weuj7vkQLPcsIBNKmUNv+EMZyjb/DoSN531MoNHmgDLmiLYsBMUDjFwmU4h10I G0UAwmWcq6+5SL5KmTKGh4RA9y6N7bdUjwWKPyDnIIY4YbgiGvWAHYodI+KbAqVaS0GL 0gu8m+lxnwwQ7iHBF7Gw0YuUzYBNx4hzfy3txH5w5isouV/I9nDFB92eb9ra9z+VtK1r jLLdwZecnCuTye41i78WzOT54UgbsoLchk3vrS9z1tXnB7y1h8zfMRgghOpq/fAYWscT t30A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=OxIgzo91; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=Bp9XHIQq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id x8si6633874jaq.91.2021.09.17.08.07.06; Fri, 17 Sep 2021 08:07:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=OxIgzo91; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=Bp9XHIQq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239302AbhIQNSn (ORCPT + 99 others); Fri, 17 Sep 2021 09:18:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47990 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236269AbhIQNSm (ORCPT ); Fri, 17 Sep 2021 09:18:42 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 53BF0C061574; Fri, 17 Sep 2021 06:17:20 -0700 (PDT) Date: Fri, 17 Sep 2021 13:17:18 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1631884639; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wVT6FtipNzvGbKA/mqO+GFWba2iEJpsvKM+7syl6gBA=; b=OxIgzo91UOPyxHkjoouOrpTfvVn3msv1STLNPr6PMoClXqZZnznNHg8xKnWbtxnD5oHMkf 36RMUULN1mquHkMWkOIAqiJ1E7B5MvswyLAcP09U36Dn6HPyP+Gzt9sXuV74y7K58ZLMm3 ahckED0crnoqM4IwIe2LOOKUCh/ZXs4ox/4tS5rsNl9RRAqbLiuIbdv+nU/Cu1T1kMnVBf W/f95tDhtEDyZuGgLr2vUIBdOztez25EaeIpuQ5XAiIy/sn7qJtxIVGuKy4ANtkoXE92Sb IDu+KEVRfyXhTcPKZ1ctv+WWqZREu9FJ48jup/xYN+lyQlWyw7B0/XFKh9YeYw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1631884639; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wVT6FtipNzvGbKA/mqO+GFWba2iEJpsvKM+7syl6gBA=; b=Bp9XHIQqABGoq5r/I8yeLDdbkuPu70Z31Ztw7bub/+1wIv4k5mZ5amGri73RpFy4lfgRCr 1/l7V6pVCQ/pnmAw== From: "tip-bot2 for Shaokun Zhang" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: locking/core] locking/lockdep: Cleanup the repeated declaration Cc: Shaokun Zhang , "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <1629875224-32751-1-git-send-email-zhangshaokun@hisilicon.com> References: <1629875224-32751-1-git-send-email-zhangshaokun@hisilicon.com> MIME-Version: 1.0 Message-ID: <163188463814.25758.7085162105849668349.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 AuthorDate: Wed, 25 Aug 2021 15:07:04 +08:00 Committer: Peter Zijlstra 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 Signed-off-by: Peter Zijlstra (Intel) Link: https://lkml.kernel.org/r/1629875224-32751-1-git-send-email-zhangshaokun@hisilicon.com --- 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);