---

yaml
---
r: 169627
b: refs/heads/master
c: 84fe848
h: refs/heads/master
i:
  169625: 3f9b1a8
  169623: 4081ef3
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82164161679c448f33092945ea97cb547a13683a
+refs/heads/master: 84fe8488ade7922afa9f3aa77c22d2d92beb9660

trunk/tools/perf/util/data_map.c

@@ -70,11 +70,10 @@ process_event(event_t *event, unsigned long offset, unsigned long head)
 	}
 }
 
-int perf_header__read_build_ids(int input, off_t size)
+int perf_header__read_build_ids(int input, off_t offset, off_t size)
 {
 	struct build_id_event bev;
 	char filename[PATH_MAX];
-	off_t offset = lseek(input, 0, SEEK_CUR);
 	off_t limit = offset + size;
 	int err = -1;
 

trunk/tools/perf/util/data_map.h

@@ -27,6 +27,6 @@ int mmap_dispatch_perf_file(struct perf_header **pheader,
 			    int full_paths,
 			    int *cwdlen,
 			    char **cwd);
-int perf_header__read_build_ids(int input, off_t file_size);
+int perf_header__read_build_ids(int input, off_t offset, off_t file_size);
 
 #endif

trunk/tools/perf/util/header.c

@@ -359,7 +359,7 @@ static void perf_header__adds_read(struct perf_header *self, int fd)
 
 		buildid_sec = &feat_sec[idx++];
 		lseek(fd, buildid_sec->offset, SEEK_SET);
-		if (perf_header__read_build_ids(fd, buildid_sec->size))
+		if (perf_header__read_build_ids(fd, buildid_sec->offset, buildid_sec->size))
 			pr_debug("failed to read buildids, continuing...\n");
 	}