Merge tag 'for-linus-hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma

[linux-2.6-block.git] / include / linux / mm_types.h

diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index 1d1093474c1a99e01c43f569f6f8ea42c2554dda..3a37a89eb7a7c363c4ac795b8ed782e657e3c6fe 100644 (file)
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -158,7 +158,7 @@ struct page {
                struct {        /* ZONE_DEVICE pages */
                        /** @pgmap: Points to the hosting device page map. */
                        struct dev_pagemap *pgmap;
-                       unsigned long hmm_data;
+                       void *zone_device_data;
                        unsigned long _zd_pad_1;        /* uses mapping */
                };
 
@@ -503,7 +503,7 @@ struct mm_struct {
 #endif
                struct work_struct async_put_work;
 
-#if IS_ENABLED(CONFIG_HMM)
+#ifdef CONFIG_HMM_MIRROR
                /* HMM needs to track a few things per mm */
                struct hmm *hmm;
 #endif