diff options
author | Wade Cherry | 2012-03-05 03:22:16 -0600 |
---|---|---|
committer | Jon Medhurst | 2012-03-05 03:27:56 -0600 |
commit | 7150bdb86762f575a92b68f43de099baa94768ab (patch) | |
tree | be293383c412d2e727df5c728d5330974efea766 | |
parent | 7a0ed3ca97fbb2088c2c55cb7fd31e84c7927372 (diff) | |
download | arm-ds5-gator-7150bdb86762f575a92b68f43de099baa94768ab.tar.gz arm-ds5-gator-7150bdb86762f575a92b68f43de099baa94768ab.tar.xz arm-ds5-gator-7150bdb86762f575a92b68f43de099baa94768ab.zip |
gator-driver: Fix build failure on Linux 3.3
Some meminfo tracepoint APIs were renamed in b413d48a (mm-tracepoint:
rename page-free events)
Signed-off-by: Wade Cherry <wade.cherry@arm.com>
Signed-off-by: Jon Medhurst <tixy@linaro.org>
-rw-r--r-- | driver/gator_events_meminfo.c | 37 |
1 files changed, 33 insertions, 4 deletions
diff --git a/driver/gator_events_meminfo.c b/driver/gator_events_meminfo.c index 8af9cfc..c763634 100644 --- a/driver/gator_events_meminfo.c +++ b/driver/gator_events_meminfo.c | |||
@@ -28,11 +28,19 @@ static void wq_sched_handler(struct work_struct *wsptr); | |||
28 | 28 | ||
29 | DECLARE_WORK(work, wq_sched_handler); | 29 | DECLARE_WORK(work, wq_sched_handler); |
30 | 30 | ||
31 | #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) | ||
31 | GATOR_DEFINE_PROBE(mm_page_free_direct, TP_PROTO(struct page *page, unsigned int order)) { | 32 | GATOR_DEFINE_PROBE(mm_page_free_direct, TP_PROTO(struct page *page, unsigned int order)) { |
33 | #else | ||
34 | GATOR_DEFINE_PROBE(mm_page_free, TP_PROTO(struct page *page, unsigned int order)) { | ||
35 | #endif | ||
32 | mem_event++; | 36 | mem_event++; |
33 | } | 37 | } |
34 | 38 | ||
39 | #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) | ||
35 | GATOR_DEFINE_PROBE(mm_pagevec_free, TP_PROTO(struct page *page, int cold)) { | 40 | GATOR_DEFINE_PROBE(mm_pagevec_free, TP_PROTO(struct page *page, int cold)) { |
41 | #else | ||
42 | GATOR_DEFINE_PROBE(mm_page_free_batched, TP_PROTO(struct page *page, int cold)) { | ||
43 | #endif | ||
36 | mem_event++; | 44 | mem_event++; |
37 | } | 45 | } |
38 | 46 | ||
@@ -83,20 +91,36 @@ static int gator_events_meminfo_start(void) | |||
83 | if (meminfo_global_enabled == 0) | 91 | if (meminfo_global_enabled == 0) |
84 | return 0; | 92 | return 0; |
85 | 93 | ||
94 | #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) | ||
86 | if (GATOR_REGISTER_TRACE(mm_page_free_direct)) | 95 | if (GATOR_REGISTER_TRACE(mm_page_free_direct)) |
87 | goto mm_page_free_direct_exit; | 96 | #else |
97 | if (GATOR_REGISTER_TRACE(mm_page_free)) | ||
98 | #endif | ||
99 | goto mm_page_free_exit; | ||
100 | #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) | ||
88 | if (GATOR_REGISTER_TRACE(mm_pagevec_free)) | 101 | if (GATOR_REGISTER_TRACE(mm_pagevec_free)) |
89 | goto mm_pagevec_free_exit; | 102 | #else |
103 | if (GATOR_REGISTER_TRACE(mm_page_free_batched)) | ||
104 | #endif | ||
105 | goto mm_page_free_batched_exit; | ||
90 | if (GATOR_REGISTER_TRACE(mm_page_alloc)) | 106 | if (GATOR_REGISTER_TRACE(mm_page_alloc)) |
91 | goto mm_page_alloc_exit; | 107 | goto mm_page_alloc_exit; |
92 | 108 | ||
93 | return 0; | 109 | return 0; |
94 | 110 | ||
95 | mm_page_alloc_exit: | 111 | mm_page_alloc_exit: |
112 | #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) | ||
96 | GATOR_UNREGISTER_TRACE(mm_pagevec_free); | 113 | GATOR_UNREGISTER_TRACE(mm_pagevec_free); |
97 | mm_pagevec_free_exit: | 114 | #else |
115 | GATOR_UNREGISTER_TRACE(mm_page_free_batched); | ||
116 | #endif | ||
117 | mm_page_free_batched_exit: | ||
118 | #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) | ||
98 | GATOR_UNREGISTER_TRACE(mm_page_free_direct); | 119 | GATOR_UNREGISTER_TRACE(mm_page_free_direct); |
99 | mm_page_free_direct_exit: | 120 | #else |
121 | GATOR_UNREGISTER_TRACE(mm_page_free); | ||
122 | #endif | ||
123 | mm_page_free_exit: | ||
100 | return -1; | 124 | return -1; |
101 | } | 125 | } |
102 | 126 | ||
@@ -105,8 +129,13 @@ static void gator_events_meminfo_stop(void) | |||
105 | int i; | 129 | int i; |
106 | 130 | ||
107 | if (meminfo_global_enabled) { | 131 | if (meminfo_global_enabled) { |
132 | #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) | ||
108 | GATOR_UNREGISTER_TRACE(mm_page_free_direct); | 133 | GATOR_UNREGISTER_TRACE(mm_page_free_direct); |
109 | GATOR_UNREGISTER_TRACE(mm_pagevec_free); | 134 | GATOR_UNREGISTER_TRACE(mm_pagevec_free); |
135 | #else | ||
136 | GATOR_UNREGISTER_TRACE(mm_page_free); | ||
137 | GATOR_UNREGISTER_TRACE(mm_page_free_batched); | ||
138 | #endif | ||
110 | GATOR_UNREGISTER_TRACE(mm_page_alloc); | 139 | GATOR_UNREGISTER_TRACE(mm_page_alloc); |
111 | } | 140 | } |
112 | 141 | ||