Merge tag 'powerpc-4.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[linux-2.6-microblaze.git] / arch / powerpc / perf / hv-24x7.c

diff --git a/arch/powerpc/perf/hv-24x7.c b/arch/powerpc/perf/hv-24x7.c
index 59012e7..2da41b7 100644 (file)
--- a/arch/powerpc/perf/hv-24x7.c
+++ b/arch/powerpc/perf/hv-24x7.c
@@ -503,14 +503,6 @@ static int event_data_to_attrs(unsigned ix, struct attribute **attrs,
        return 0;
 }
 
-static unsigned long vmalloc_to_phys(void *v)
-{
-       struct page *p = vmalloc_to_page(v);
-
-       BUG_ON(!p);
-       return page_to_phys(p) + offset_in_page(v);
-}
-
 /* */
 struct event_uniq {
        struct rb_node node;