diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-11-23 03:04:05 -0500 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-11-23 03:04:05 -0500 |
| commit | 92907cbbef8625bb3998d1eb385fc88f23c97a3f (patch) | |
| tree | 15626ff9287e37c3cb81c7286d6db5a7fd77c854 /include/asm-generic/preempt.h | |
| parent | 15fbfccfe92c62ae8d1ecc647c44157ed01ac02e (diff) | |
| parent | 1ec218373b8ebda821aec00bb156a9c94fad9cd4 (diff) | |
Merge tag 'v4.4-rc2' into drm-intel-next-queued
Linux 4.4-rc2
Backmerge to get at
commit 1b0e3a049efe471c399674fd954500ce97438d30
Author: Imre Deak <imre.deak@intel.com>
Date: Thu Nov 5 23:04:11 2015 +0200
drm/i915/skl: disable display side power well support for now
so that we can proplery re-eanble skl power wells in -next.
Conflicts are just adjacent lines changed, except for intel_fbdev.c
where we need to interleave the changs. Nothing nefarious.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'include/asm-generic/preempt.h')
| -rw-r--r-- | include/asm-generic/preempt.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-generic/preempt.h b/include/asm-generic/preempt.h index 0bec580a4885..5d8ffa3e6f8c 100644 --- a/include/asm-generic/preempt.h +++ b/include/asm-generic/preempt.h | |||
| @@ -24,7 +24,7 @@ static __always_inline void preempt_count_set(int pc) | |||
| 24 | * must be macros to avoid header recursion hell | 24 | * must be macros to avoid header recursion hell |
| 25 | */ | 25 | */ |
| 26 | #define init_task_preempt_count(p) do { \ | 26 | #define init_task_preempt_count(p) do { \ |
| 27 | task_thread_info(p)->preempt_count = PREEMPT_DISABLED; \ | 27 | task_thread_info(p)->preempt_count = FORK_PREEMPT_COUNT; \ |
| 28 | } while (0) | 28 | } while (0) |
| 29 | 29 | ||
| 30 | #define init_idle_preempt_count(p, cpu) do { \ | 30 | #define init_idle_preempt_count(p, cpu) do { \ |