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/linux/compaction.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/linux/compaction.h')
| -rw-r--r-- | include/linux/compaction.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/compaction.h b/include/linux/compaction.h index aa8f61cf3a19..4cd4ddf64cc7 100644 --- a/include/linux/compaction.h +++ b/include/linux/compaction.h | |||
| @@ -15,7 +15,8 @@ | |||
| 15 | /* For more detailed tracepoint output */ | 15 | /* For more detailed tracepoint output */ |
| 16 | #define COMPACT_NO_SUITABLE_PAGE 5 | 16 | #define COMPACT_NO_SUITABLE_PAGE 5 |
| 17 | #define COMPACT_NOT_SUITABLE_ZONE 6 | 17 | #define COMPACT_NOT_SUITABLE_ZONE 6 |
| 18 | /* When adding new state, please change compaction_status_string, too */ | 18 | #define COMPACT_CONTENDED 7 |
| 19 | /* When adding new states, please adjust include/trace/events/compaction.h */ | ||
| 19 | 20 | ||
| 20 | /* Used to signal whether compaction detected need_sched() or lock contention */ | 21 | /* Used to signal whether compaction detected need_sched() or lock contention */ |
| 21 | /* No contention detected */ | 22 | /* No contention detected */ |