evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

perf kmem: Fix compiles on RHEL6/OL6

Browse source 
0d68bc92c4 breaks compiles on RHEL6/OL6:
    cc1: warnings being treated as errors
    builtin-kmem.c: In function ‘search_page_alloc_stat’:
    builtin-kmem.c:322: error: declaration of ‘stat’ shadows a global declaration
                            node = &parent->rb_left;
    /usr/include/sys/stat.h:455: error: shadowed declaration is here
    builtin-kmem.c: In function ‘perf_evsel__process_page_alloc_event’:
    builtin-kmem.c:378: error: declaration of ‘stat’ shadows a global declaration
    /usr/include/sys/stat.h:455: error: shadowed declaration is here
    builtin-kmem.c: In function ‘perf_evsel__process_page_free_event’:
    builtin-kmem.c:431: error: declaration of ‘stat’ shadows a global declaration
    /usr/include/sys/stat.h:455: error: shadowed declaration is here

Rename local variable to pstat to avoid the name conflict.

Signed-off-by: David Ahern <david.ahern@oracle.com>
Link: http://lkml.kernel.org/r/1429033773-31383-1-git-send-email-david.ahern@oracle.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
David Ahern 2015-04-14 13:49:33 -04:00 • committed by Arnaldo Carvalho de Melo
parent de28c15daf
commit 4ad1f4300e
1 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
tools/perf/builtin-kmem.c
View file

@ -319,7 +319,7 @@ static int page_stat_cmp(struct page_stat *a, struct page_stat *b)
return 0; return 0;
} }
static struct page_stat *search_page_alloc_stat(struct page_stat *stat, bool create) static struct page_stat *search_page_alloc_stat(struct page_stat *pstat, bool create)
{ {
struct rb_node **node = &page_alloc_tree.rb_node; struct rb_node **node = &page_alloc_tree.rb_node;
struct rb_node *parent = NULL; struct rb_node *parent = NULL;
@ -331,7 +331,7 @@ static struct page_stat *search_page_alloc_stat(struct page_stat *stat, bool cre
parent = *node; parent = *node;
data = rb_entry(*node, struct page_stat, node); data = rb_entry(*node, struct page_stat, node);
cmp = page_stat_cmp(data, stat); cmp = page_stat_cmp(data, pstat);
if (cmp < 0) if (cmp < 0)
node = &parent->rb_left; node = &parent->rb_left;
else if (cmp > 0) else if (cmp > 0)
@ -345,10 +345,10 @@ static struct page_stat *search_page_alloc_stat(struct page_stat *stat, bool cre
data = zalloc(sizeof(*data)); data = zalloc(sizeof(*data));
if (data != NULL) { if (data != NULL) {
data->page = stat->page; data->page = pstat->page;
data->order = stat->order; data->order = pstat->order;
data->gfp_flags = stat->gfp_flags; data->gfp_flags = pstat->gfp_flags;
data->migrate_type = stat->migrate_type; data->migrate_type = pstat->migrate_type;
rb_link_node(&data->node, parent, node); rb_link_node(&data->node, parent, node);
rb_insert_color(&data->node, &page_alloc_tree); rb_insert_color(&data->node, &page_alloc_tree);
@ -375,7 +375,7 @@ static int perf_evsel__process_page_alloc_event(struct perf_evsel *evsel,
unsigned int migrate_type = perf_evsel__intval(evsel, sample, unsigned int migrate_type = perf_evsel__intval(evsel, sample,
"migratetype"); "migratetype");
u64 bytes = kmem_page_size << order; u64 bytes = kmem_page_size << order;
struct page_stat *stat; struct page_stat *pstat;
struct page_stat this = { struct page_stat this = {
.order = order, .order = order,
.gfp_flags = gfp_flags, .gfp_flags = gfp_flags,
@ -401,21 +401,21 @@ static int perf_evsel__process_page_alloc_event(struct perf_evsel *evsel,
* This is to find the current page (with correct gfp flags and * This is to find the current page (with correct gfp flags and
* migrate type) at free event. * migrate type) at free event.
*/ */
stat = search_page(page, true); pstat = search_page(page, true);
if (stat == NULL) if (pstat == NULL)
return -ENOMEM; return -ENOMEM;
stat->order = order; pstat->order = order;
stat->gfp_flags = gfp_flags; pstat->gfp_flags = gfp_flags;
stat->migrate_type = migrate_type; pstat->migrate_type = migrate_type;
this.page = page; this.page = page;
stat = search_page_alloc_stat(&this, true); pstat = search_page_alloc_stat(&this, true);
if (stat == NULL) if (pstat == NULL)
return -ENOMEM; return -ENOMEM;
stat->nr_alloc++; pstat->nr_alloc++;
stat->alloc_bytes += bytes; pstat->alloc_bytes += bytes;
order_stats[order][migrate_type]++; order_stats[order][migrate_type]++;
@ -428,7 +428,7 @@ static int perf_evsel__process_page_free_event(struct perf_evsel *evsel,
u64 page; u64 page;
unsigned int order = perf_evsel__intval(evsel, sample, "order"); unsigned int order = perf_evsel__intval(evsel, sample, "order");
u64 bytes = kmem_page_size << order; u64 bytes = kmem_page_size << order;
struct page_stat *stat; struct page_stat *pstat;
struct page_stat this = { struct page_stat this = {
.order = order, .order = order,
}; };
@ -441,8 +441,8 @@ static int perf_evsel__process_page_free_event(struct perf_evsel *evsel,
nr_page_frees++; nr_page_frees++;
total_page_free_bytes += bytes; total_page_free_bytes += bytes;
stat = search_page(page, false); pstat = search_page(page, false);
if (stat == NULL) { if (pstat == NULL) {
pr_debug2("missing free at page %"PRIx64" (order: %d)\n", pr_debug2("missing free at page %"PRIx64" (order: %d)\n",
page, order); page, order);
@ -453,18 +453,18 @@ static int perf_evsel__process_page_free_event(struct perf_evsel *evsel,
} }
this.page = page; this.page = page;
this.gfp_flags = stat->gfp_flags; this.gfp_flags = pstat->gfp_flags;
this.migrate_type = stat->migrate_type; this.migrate_type = pstat->migrate_type;
rb_erase(&stat->node, &page_tree); rb_erase(&pstat->node, &page_tree);
free(stat); free(pstat);
stat = search_page_alloc_stat(&this, false); pstat = search_page_alloc_stat(&this, false);
if (stat == NULL) if (pstat == NULL)
return -ENOENT; return -ENOENT;
stat->nr_free++; pstat->nr_free++;
stat->free_bytes += bytes; pstat->free_bytes += bytes;
return 0; return 0;
} }