diff --git a/[refs] b/[refs]
index 3f11e6b93376..de7d452fc792 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 55717314c4e3a5180a54228a2f97e50f3496de4c
+refs/heads/master: d3e78ee3d015dac1794433abb6403b6fc8e70e10
diff --git a/trunk/include/linux/perf_counter.h b/trunk/include/linux/perf_counter.h
index 2b16ed37b74c..a65ddc580514 100644
--- a/trunk/include/linux/perf_counter.h
+++ b/trunk/include/linux/perf_counter.h
@@ -641,7 +641,7 @@ perf_counter_task_sched_out(struct task_struct *task,
 			    struct task_struct *next, int cpu)		{ }
 static inline void
 perf_counter_task_tick(struct task_struct *task, int cpu)		{ }
-static inline int perf_counter_init_task(struct task_struct *child)	{ }
+static inline int perf_counter_init_task(struct task_struct *child)	{ return 0; }
 static inline void perf_counter_exit_task(struct task_struct *child)	{ }
 static inline void perf_counter_do_pending(void)			{ }
 static inline void perf_counter_print_debug(void)			{ }