diff options
| author | Tony Lindgren <tony@atomide.com> | 2016-04-08 09:18:00 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2016-04-08 09:18:00 -0700 |
| commit | 19e831b272e6db5884be085be66e44da975c73a9 (patch) | |
| tree | 8812543bc66dc531e4720f5119107e7de3447a46 /include/linux/sched.h | |
| parent | 6f40fed1c911f218e1e189a404b26ef19effabb5 (diff) | |
| parent | 571afb4c8a4bbe88541364e7f6827340562f2736 (diff) | |
Merge branch 'fixes-rc2' into omap-for-v4.6/fixes
Diffstat (limited to 'include/linux/sched.h')
| -rw-r--r-- | include/linux/sched.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 60bba7e032dc..52c4847b05e2 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -720,7 +720,7 @@ struct signal_struct { struct task_cputime cputime_expires; #ifdef CONFIG_NO_HZ_FULL - unsigned long tick_dep_mask; + atomic_t tick_dep_mask; #endif struct list_head cpu_timers[3]; @@ -1549,7 +1549,7 @@ struct task_struct { #endif #ifdef CONFIG_NO_HZ_FULL - unsigned long tick_dep_mask; + atomic_t tick_dep_mask; #endif unsigned long nvcsw, nivcsw; /* context switch counts */ u64 start_time; /* monotonic time in nsec */ |