From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752886AbbETGnh (ORCPT ); Wed, 20 May 2015 02:43:37 -0400 Received: from LGEMRELSE7Q.lge.com ([156.147.1.151]:51285 "EHLO lgemrelse7q.lge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751928AbbETGnc (ORCPT ); Wed, 20 May 2015 02:43:32 -0400 X-Original-SENDERIP: 10.177.220.203 X-Original-MAILFROM: namhyung@kernel.org From: Namhyung Kim To: Arnaldo Carvalho de Melo Cc: Ingo Molnar , Peter Zijlstra , Jiri Olsa , LKML , David Ahern , Adrian Hunter Subject: [PATCH 1/4] Revert "perf tools: Fix data_read_offset() file opening" Date: Wed, 20 May 2015 15:34:04 +0900 Message-Id: <1432103647-14017-1-git-send-email-namhyung@kernel.org> X-Mailer: git-send-email 2.4.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This reverts commit 9ba6765a979f5f7d3f6456f8c79c66f4aef2d66b. The problem will be fixed by later patch in some other way. Cc: Adrian Hunter Signed-off-by: Namhyung Kim --- Arnaldo, you can ignore this if you drop the Adrian's patch in the tree.. tools/perf/util/dso.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c index e248f5693a48..1b96c8d18435 100644 --- a/tools/perf/util/dso.c +++ b/tools/perf/util/dso.c @@ -756,7 +756,7 @@ off_t dso__data_size(struct dso *dso, struct machine *machine) static ssize_t data_read_offset(struct dso *dso, struct machine *machine, u64 offset, u8 *data, ssize_t size) { - if (dso__data_size(dso, machine) < 0) + if (data_file_size(dso, machine)) return -1; /* Check the offset sanity. */ -- 2.4.0