diff --git a/[refs] b/[refs] index d8cefaa7a1d3..3694af58ca34 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b91c4996df56fcd201f85c392a1de7bc3f6641f5 +refs/heads/master: 1b02469088ac7a13d7e622b618b7410d0f1ce5ec diff --git a/trunk/include/linux/hrtimer.h b/trunk/include/linux/hrtimer.h index 68b0196d8696..8730b60c9432 100644 --- a/trunk/include/linux/hrtimer.h +++ b/trunk/include/linux/hrtimer.h @@ -115,12 +115,12 @@ struct hrtimer { enum hrtimer_restart (*function)(struct hrtimer *); struct hrtimer_clock_base *base; unsigned long state; - enum hrtimer_cb_mode cb_mode; struct list_head cb_entry; + enum hrtimer_cb_mode cb_mode; #ifdef CONFIG_TIMER_STATS + int start_pid; void *start_site; char start_comm[16]; - int start_pid; #endif };