From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932231AbbHYHtp (ORCPT ); Tue, 25 Aug 2015 03:49:45 -0400 Received: from terminus.zytor.com ([198.137.202.10]:38457 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755422AbbHYHtn (ORCPT ); Tue, 25 Aug 2015 03:49:43 -0400 Date: Tue, 25 Aug 2015 00:49:14 -0700 From: tip-bot for Sasha Levin Message-ID: Cc: sasha.levin@oracle.com, torvalds@linux-foundation.org, hpa@zytor.com, peterz@infradead.org, mingo@kernel.org, tglx@linutronix.de, linux-kernel@vger.kernel.org Reply-To: mingo@kernel.org, peterz@infradead.org, hpa@zytor.com, torvalds@linux-foundation.org, sasha.levin@oracle.com, tglx@linutronix.de, linux-kernel@vger.kernel.org In-Reply-To: <1440479985-6696-3-git-send-email-sasha.levin@oracle.com> References: <1440479985-6696-3-git-send-email-sasha.levin@oracle.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:locking/urgent] tools/liblockdep: Use the rbtree header provided by common tools headers Git-Commit-ID: 33fef662d20a8a98bafa6b2430b845def30f616a X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 33fef662d20a8a98bafa6b2430b845def30f616a Gitweb: http://git.kernel.org/tip/33fef662d20a8a98bafa6b2430b845def30f616a Author: Sasha Levin AuthorDate: Tue, 25 Aug 2015 01:19:45 -0400 Committer: Ingo Molnar CommitDate: Tue, 25 Aug 2015 09:44:23 +0200 tools/liblockdep: Use the rbtree header provided by common tools headers Recent changes to rbtree.h may break compilation. There is no reason to use a liblockdep specific header to begin with, so we'll use the one shared with all other tools/. Signed-off-by: Sasha Levin Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1440479985-6696-3-git-send-email-sasha.levin@oracle.com Signed-off-by: Ingo Molnar --- tools/lib/lockdep/preload.c | 2 +- tools/lib/lockdep/uinclude/linux/rbtree.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/lib/lockdep/preload.c b/tools/lib/lockdep/preload.c index 0b0112c..21cdf86 100644 --- a/tools/lib/lockdep/preload.c +++ b/tools/lib/lockdep/preload.c @@ -5,7 +5,7 @@ #include #include #include "include/liblockdep/mutex.h" -#include "../../../include/linux/rbtree.h" +#include "../../include/linux/rbtree.h" /** * struct lock_lookup - liblockdep's view of a single unique lock diff --git a/tools/lib/lockdep/uinclude/linux/rbtree.h b/tools/lib/lockdep/uinclude/linux/rbtree.h deleted file mode 100644 index 965901d..0000000 --- a/tools/lib/lockdep/uinclude/linux/rbtree.h +++ /dev/null @@ -1 +0,0 @@ -#include "../../../include/linux/rbtree.h"