perf stat aggregation: Add separate core member

[linux-2.6-microblaze.git] / tools / perf / util / cpumap.h

diff --git a/tools/perf/util/cpumap.h b/tools/perf/util/cpumap.h
index d8fc265..1bb8f7d 100644 (file)
--- a/tools/perf/util/cpumap.h
+++ b/tools/perf/util/cpumap.h
@@ -9,6 +9,10 @@
 
 struct aggr_cpu_id {
        int id;
+       int node;
+       int socket;
+       int die;
+       int core;
 };
 
 struct cpu_aggr_map {
@@ -47,21 +51,6 @@ static inline int cpu_map__socket(struct perf_cpu_map *sock, int s)
        return sock->map[s];
 }
 
-static inline int cpu_map__id_to_socket(int id)
-{
-       return id >> 24;
-}
-
-static inline int cpu_map__id_to_die(int id)
-{
-       return (id >> 16) & 0xff;
-}
-
-static inline int cpu_map__id_to_cpu(int id)
-{
-       return id & 0xffff;
-}
-
 int cpu__setup_cpunode_map(void);
 
 int cpu__max_node(void);