diff --git a/[refs] b/[refs] index 59104d037370..4820588dfb25 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a386b5af8edda1c742ce9f77891e112eefffc005 +refs/heads/master: d0959024d8fb6555ba8bfdc6624cc7b7c2e675fd diff --git a/trunk/include/linux/timer.h b/trunk/include/linux/timer.h index 38cf093ef62c..f3dccdb44f95 100644 --- a/trunk/include/linux/timer.h +++ b/trunk/include/linux/timer.h @@ -24,9 +24,9 @@ struct timer_list { int slack; #ifdef CONFIG_TIMER_STATS + int start_pid; void *start_site; char start_comm[16]; - int start_pid; #endif #ifdef CONFIG_LOCKDEP struct lockdep_map lockdep_map;