Skip to content

Commit

Permalink
x86: cpa: rename global_flush_tlb() to cpa_flush_all()
Browse files Browse the repository at this point in the history
The function name global_flush_tlb() suggests something different from
what the function really does. Rename it to cpa_flush_all(), which is an
understandable counterpart to cpa_flush_range().

no global visibility of the old API anymore.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Thomas Gleixner authored and Ingo Molnar committed Jan 30, 2008
1 parent 57a6a46 commit af1e684
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions arch/x86/mm/pageattr-test.c
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ static __init int exercise_pageattr(void)

}
vfree(bm);
global_flush_tlb();
cpa_flush_all();

failed += print_split(&sb);

Expand Down Expand Up @@ -211,7 +211,7 @@ static __init int exercise_pageattr(void)
}

}
global_flush_tlb();
cpa_flush_all();

failed += print_split(&sc);

Expand Down
10 changes: 5 additions & 5 deletions arch/x86/mm/pageattr.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ void clflush_cache_range(void *addr, int size)
clflush(addr+i);
}

static void flush_kernel_map(void *arg)
static void __cpa_flush_all(void *arg)
{
/*
* Flush all to work around Errata in early athlons regarding
Expand All @@ -45,11 +45,11 @@ static void flush_kernel_map(void *arg)
wbinvd();
}

static void global_flush_tlb(void)
static void cpa_flush_all(void)
{
BUG_ON(irqs_disabled());

on_each_cpu(flush_kernel_map, NULL, 1, 1);
on_each_cpu(__cpa_flush_all, NULL, 1, 1);
}

struct clflush_data {
Expand Down Expand Up @@ -350,13 +350,13 @@ static int change_page_attr_set_clr(unsigned long addr, int numpages,
/*
* On success we use clflush, when the CPU supports it to
* avoid the wbindv. If the CPU does not support it and in the
* error case we fall back to global_flush_tlb (which uses
* error case we fall back to cpa_flush_all (which uses
* wbindv):
*/
if (!ret && cpu_has_clflush)
cpa_flush_range(addr, numpages);
else
global_flush_tlb();
cpa_flush_all();

return ret;
}
Expand Down

0 comments on commit af1e684

Please sign in to comment.