From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754263AbbHYFUt (ORCPT ); Tue, 25 Aug 2015 01:20:49 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:22138 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751681AbbHYFT7 (ORCPT ); Tue, 25 Aug 2015 01:19:59 -0400 From: Sasha Levin To: mingo@kernel.org Cc: linux-kernel@vger.kernel.org, Sasha Levin Subject: [PATCH 3/3] tools/liblockdep: use the rbtree header provided by common tools headers Date: Tue, 25 Aug 2015 01:19:45 -0400 Message-Id: <1440479985-6696-3-git-send-email-sasha.levin@oracle.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1440479985-6696-1-git-send-email-sasha.levin@oracle.com> References: <1440479985-6696-1-git-send-email-sasha.levin@oracle.com> X-Source-IP: userv0021.oracle.com [156.151.31.71] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- tools/lib/lockdep/preload.c | 2 +- tools/lib/lockdep/uinclude/linux/rbtree.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 tools/lib/lockdep/uinclude/linux/rbtree.h 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" -- 2.1.4