summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wilcox <mawilcox@microsoft.com>2018-06-07 17:09:01 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2018-06-07 17:34:37 -0700
commit50e7fbc3bf0c3e41af0075f17a9e4ddefa82e1b5 (patch)
treedcab567ca396c67f0ab9e060644ee74491bae532
parenta052f0a5168ef99c517f6638aaec59f39060f81d (diff)
downloadlinux-0-day-50e7fbc3bf0c3e41af0075f17a9e4ddefa82e1b5.tar.gz
linux-0-day-50e7fbc3bf0c3e41af0075f17a9e4ddefa82e1b5.tar.xz
mm: add hmm_data to struct page
Make hmm_data an explicit member of the struct page union. Link: http://lkml.kernel.org/r/20180518194519.3820-14-willy@infradead.org Signed-off-by: Matthew Wilcox <mawilcox@microsoft.com> Acked-by: Vlastimil Babka <vbabka@suse.cz> Cc: Christoph Lameter <cl@linux.com> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: Jérôme Glisse <jglisse@redhat.com> Cc: "Kirill A . Shutemov" <kirill.shutemov@linux.intel.com> Cc: Lai Jiangshan <jiangshanlai@gmail.com> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Pekka Enberg <penberg@kernel.org> Cc: Randy Dunlap <rdunlap@infradead.org> Cc: Andrey Ryabinin <aryabinin@virtuozzo.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--include/linux/hmm.h8
-rw-r--r--include/linux/mm_types.h12
2 files changed, 8 insertions, 12 deletions
diff --git a/include/linux/hmm.h b/include/linux/hmm.h
index 2f1327c37a63d..4c92e3ba3e168 100644
--- a/include/linux/hmm.h
+++ b/include/linux/hmm.h
@@ -522,9 +522,7 @@ void hmm_devmem_remove(struct hmm_devmem *devmem);
static inline void hmm_devmem_page_set_drvdata(struct page *page,
unsigned long data)
{
- unsigned long *drvdata = (unsigned long *)&page->pgmap;
-
- drvdata[1] = data;
+ page->hmm_data = data;
}
/*
@@ -535,9 +533,7 @@ static inline void hmm_devmem_page_set_drvdata(struct page *page,
*/
static inline unsigned long hmm_devmem_page_get_drvdata(const struct page *page)
{
- const unsigned long *drvdata = (const unsigned long *)&page->pgmap;
-
- return drvdata[1];
+ return page->hmm_data;
}
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index 811aa0c71e1a0..99ce070e7dcb4 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -146,15 +146,15 @@ struct page {
spinlock_t ptl;
#endif
};
+ struct { /* ZONE_DEVICE pages */
+ /** @pgmap: Points to the hosting device page map. */
+ struct dev_pagemap *pgmap;
+ unsigned long hmm_data;
+ unsigned long _zd_pad_1; /* uses mapping */
+ };
/** @rcu_head: You can use this to free a page by RCU. */
struct rcu_head rcu_head;
-
- /**
- * @pgmap: For ZONE_DEVICE pages, this points to the hosting
- * device page map.
- */
- struct dev_pagemap *pgmap;
};
union { /* This union is 4 bytes in size. */