diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2021-10-29 13:38:34 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2021-10-29 13:40:45 +0300 |
| commit | c1bb3a463dac815598362fb642a2746ff0e8f2f8 (patch) | |
| tree | 090d50f01c5c4e1e29b1d4398251745715e5a2a9 /include/linux/migrate.h | |
| parent | ead3ea12e133416fbd800eedb2fb5d0faf2df431 (diff) | |
| parent | 31fa8cbce4664946a1688898410fee41ad05364d (diff) | |
Merge drm/drm-next into drm-intel-next
Backmerge to get the DP 2.0 MST changes merged to drm-next. This also
syncs us up to v5.15-rc7.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'include/linux/migrate.h')
| -rw-r--r-- | include/linux/migrate.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/migrate.h b/include/linux/migrate.h index 326250996b4e..c8077e936691 100644 --- a/include/linux/migrate.h +++ b/include/linux/migrate.h @@ -19,6 +19,11 @@ struct migration_target_control; */ #define MIGRATEPAGE_SUCCESS 0 +/* + * Keep sync with: + * - macro MIGRATE_REASON in include/trace/events/migrate.h + * - migrate_reason_names[MR_TYPES] in mm/debug.c + */ enum migrate_reason { MR_COMPACTION, MR_MEMORY_FAILURE, @@ -32,7 +37,6 @@ enum migrate_reason { MR_TYPES }; -/* In mm/debug.c; also keep sync with include/trace/events/migrate.h */ extern const char *migrate_reason_names[MR_TYPES]; #ifdef CONFIG_MIGRATION |