diff --git a/[refs] b/[refs] index b149cbc56a5e..abdab2abe7e7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eef6cbf5844c620d9db9be99e4908cdf92492fb9 +refs/heads/master: 78b6084c907cea15bb40a564b974e072f5163781 diff --git a/trunk/include/linux/init_task.h b/trunk/include/linux/init_task.h index 54fa2fa2c8e4..467cff545c30 100644 --- a/trunk/include/linux/init_task.h +++ b/trunk/include/linux/init_task.h @@ -116,7 +116,9 @@ extern struct group_info init_groups; #ifdef CONFIG_PERF_COUNTERS # define INIT_PERF_COUNTERS(tsk) \ .perf_counter_ctx.counter_list = \ - LIST_HEAD_INIT(tsk.perf_counter_ctx.counter_list), + LIST_HEAD_INIT(tsk.perf_counter_ctx.counter_list), \ + .perf_counter_ctx.lock = \ + __SPIN_LOCK_UNLOCKED(tsk.perf_counter_ctx.lock), #else # define INIT_PERF_COUNTERS(tsk) #endif