From 273f7c98f3105166e6361bd03ae37fcbf81df369 Mon Sep 17 00:00:00 2001
From: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Date: Wed, 2 Dec 2009 16:08:41 +0800
Subject: [PATCH] --- yaml --- r: 169847 b: refs/heads/master c:
 bdad0db7dbdb37d0bb3c7d0f65cd3ff599ea6ecb h: refs/heads/master i:   169845:
 b374c83aaa52e31c5ed54e0a48b6bf782d4cfe26   169843:
 7766c25e8edae203310172c5349450ec38bd9676   169839:
 4d88924f5f429cff503f31b3d24157b31e1b0efe v: v3

---
 [refs]                           | 2 +-
 trunk/tools/perf/builtin-probe.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 867fd2befd09..6a6c4e05dac1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c19e33aa840e9202ef8d4c93056b59f3edc2208d
+refs/heads/master: bdad0db7dbdb37d0bb3c7d0f65cd3ff599ea6ecb
diff --git a/trunk/tools/perf/builtin-probe.c b/trunk/tools/perf/builtin-probe.c
index b5d15cf25471..a58e11b7ea80 100644
--- a/trunk/tools/perf/builtin-probe.c
+++ b/trunk/tools/perf/builtin-probe.c
@@ -160,7 +160,10 @@ static const struct option options[] = {
 
 int cmd_probe(int argc, const char **argv, const char *prefix __used)
 {
-	int i, j, fd, ret;
+	int i, j, ret;
+#ifndef NO_LIBDWARF
+	int fd;
+#endif
 	struct probe_point *pp;
 
 	argc = parse_options(argc, argv, options, probe_usage,