diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-01-19 09:53:43 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-01-19 09:53:43 -0500 |
| commit | 9e4c84967ef027fe50a03cf48dd6da9519c8e60c (patch) | |
| tree | 21d6b8168670f22521f3bb703e3b9d1932566c1c /tools/perf/builtin-kmem.c | |
| parent | d2f2fcd2541bae004db7f4798ffd9d2cb75ae817 (diff) | |
| parent | 3fb4a508b8e7957aa899f32cd6d9d462e102c7ca (diff) | |
Merge branch 'fix/hda' into topic/hda
Conflicts:
sound/pci/hda/patch_realtek.c
Diffstat (limited to 'tools/perf/builtin-kmem.c')
| -rw-r--r-- | tools/perf/builtin-kmem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c index fc21ad79dd83..7ceb7416c316 100644 --- a/tools/perf/builtin-kmem.c +++ b/tools/perf/builtin-kmem.c | |||
| @@ -137,7 +137,7 @@ static void insert_alloc_stat(unsigned long call_site, unsigned long ptr, | |||
| 137 | if (data && data->ptr == ptr) { | 137 | if (data && data->ptr == ptr) { |
| 138 | data->hit++; | 138 | data->hit++; |
| 139 | data->bytes_req += bytes_req; | 139 | data->bytes_req += bytes_req; |
| 140 | data->bytes_alloc += bytes_req; | 140 | data->bytes_alloc += bytes_alloc; |
| 141 | } else { | 141 | } else { |
| 142 | data = malloc(sizeof(*data)); | 142 | data = malloc(sizeof(*data)); |
| 143 | if (!data) | 143 | if (!data) |
| @@ -177,7 +177,7 @@ static void insert_caller_stat(unsigned long call_site, | |||
| 177 | if (data && data->call_site == call_site) { | 177 | if (data && data->call_site == call_site) { |
| 178 | data->hit++; | 178 | data->hit++; |
| 179 | data->bytes_req += bytes_req; | 179 | data->bytes_req += bytes_req; |
| 180 | data->bytes_alloc += bytes_req; | 180 | data->bytes_alloc += bytes_alloc; |
| 181 | } else { | 181 | } else { |
| 182 | data = malloc(sizeof(*data)); | 182 | data = malloc(sizeof(*data)); |
| 183 | if (!data) | 183 | if (!data) |