diff options
Diffstat (limited to 'arch/frv/lib')
-rw-r--r-- | arch/frv/lib/Makefile | 2 | ||||
-rw-r--r-- | arch/frv/lib/perf_event.c (renamed from arch/frv/lib/perf_counter.c) | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/frv/lib/Makefile b/arch/frv/lib/Makefile index 0a377210c89b..f4709756d0d9 100644 --- a/arch/frv/lib/Makefile +++ b/arch/frv/lib/Makefile | |||
@@ -5,4 +5,4 @@ | |||
5 | lib-y := \ | 5 | lib-y := \ |
6 | __ashldi3.o __lshrdi3.o __muldi3.o __ashrdi3.o __negdi2.o __ucmpdi2.o \ | 6 | __ashldi3.o __lshrdi3.o __muldi3.o __ashrdi3.o __negdi2.o __ucmpdi2.o \ |
7 | checksum.o memcpy.o memset.o atomic-ops.o atomic64-ops.o \ | 7 | checksum.o memcpy.o memset.o atomic-ops.o atomic64-ops.o \ |
8 | outsl_ns.o outsl_sw.o insl_ns.o insl_sw.o cache.o perf_counter.o | 8 | outsl_ns.o outsl_sw.o insl_ns.o insl_sw.o cache.o perf_event.o |
diff --git a/arch/frv/lib/perf_counter.c b/arch/frv/lib/perf_event.c index 2000feecd571..9ac5acfd2e91 100644 --- a/arch/frv/lib/perf_counter.c +++ b/arch/frv/lib/perf_event.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* Performance counter handling | 1 | /* Performance event handling |
2 | * | 2 | * |
3 | * Copyright (C) 2009 Red Hat, Inc. All Rights Reserved. | 3 | * Copyright (C) 2009 Red Hat, Inc. All Rights Reserved. |
4 | * Written by David Howells (dhowells@redhat.com) | 4 | * Written by David Howells (dhowells@redhat.com) |
@@ -9,11 +9,11 @@ | |||
9 | * 2 of the Licence, or (at your option) any later version. | 9 | * 2 of the Licence, or (at your option) any later version. |
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include <linux/perf_counter.h> | 12 | #include <linux/perf_event.h> |
13 | 13 | ||
14 | /* | 14 | /* |
15 | * mark the performance counter as pending | 15 | * mark the performance event as pending |
16 | */ | 16 | */ |
17 | void set_perf_counter_pending(void) | 17 | void set_perf_event_pending(void) |
18 | { | 18 | { |
19 | } | 19 | } |