X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=wrapper%2Fperf.h;h=4a7f6d8582873b9075a021595aea291cec2971b0;hb=f3cd1cf88a6961f59d9452bcb82eb91054012a2f;hp=48e256c86b49ffe3e3d4e3ca30a0ea93855f05c6;hpb=950ed24b44975b929576a926206a559c64b4867c;p=deliverable%2Flttng-modules.git diff --git a/wrapper/perf.h b/wrapper/perf.h index 48e256c8..4a7f6d85 100644 --- a/wrapper/perf.h +++ b/wrapper/perf.h @@ -22,8 +22,6 @@ wrapper_perf_event_create_kernel_counter(struct perf_event_attr *attr, return perf_event_create_kernel_counter(attr, cpu, task, callback, NULL); } #else /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)) */ - -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) static inline struct perf_event * wrapper_perf_event_create_kernel_counter(struct perf_event_attr *attr, int cpu, @@ -32,29 +30,6 @@ wrapper_perf_event_create_kernel_counter(struct perf_event_attr *attr, { return perf_event_create_kernel_counter(attr, cpu, task, callback); } -#else /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) */ -static inline struct perf_event * -wrapper_perf_event_create_kernel_counter(struct perf_event_attr *attr, - int cpu, - struct task_struct *task, - perf_overflow_handler_t callback) -{ - pid_t pid; - - if (!task) - pid = -1; - else - pid = task->pid; - - return perf_event_create_kernel_counter(attr, cpu, pid, callback); -} - -#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) */ - -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)) -#define local64_read(l) atomic64_read(l) -#endif - #endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)) */ #endif /* CONFIG_PERF_EVENTS */