diff options
| author |   Dan Williams <dan.j.williams@intel.com> | 2016-01-10 07:53:55 -0800 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2016-01-10 07:53:55 -0800 |
| commit | 8b63b6bfc1a551acf154061699028c7032d7890c (patch) | |
| tree | 16882e9bc9e35eacb870a6d8a71617e579c4ffdc /mm/page_alloc.c | |
| parent | libnvdimm: fix namespace object confusion in is_uuid_busy() (diff) | |
| parent | block: kill disk_{check|set|clear|alloc}_badblocks (diff) | |
| download | wireguard-linux-8b63b6bfc1a551acf154061699028c7032d7890c.tar.xz wireguard-linux-8b63b6bfc1a551acf154061699028c7032d7890c.zip | |
Merge branch 'for-4.5/block-dax' into for-4.5/libnvdimm
Diffstat (limited to '')
| -rw-r--r-- | mm/page_alloc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 17a3c66639a9..9d666df5ef95 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -3647,8 +3647,9 @@ static void show_migration_types(unsigned char type) { static const char types[MIGRATE_TYPES] = { [MIGRATE_UNMOVABLE] = 'U', - [MIGRATE_RECLAIMABLE] = 'E', [MIGRATE_MOVABLE] = 'M', + [MIGRATE_RECLAIMABLE] = 'E', + [MIGRATE_HIGHATOMIC] = 'H', #ifdef CONFIG_CMA [MIGRATE_CMA] = 'C', #endif |