Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

# Conflicts:
#	Documentation/translations/zh_CN/mm/free_page_reporting.rst
#	Documentation/translations/zh_CN/mm/frontswap.rst
#	Documentation/translations/zh_CN/mm/page_frags.rst
#	Documentation/translations/zh_CN/mm/page_migration.rst
#	Documentation/translations/zh_CN/mm/vmalloced-kernel-stacks.rst
#	Documentation/translations/zh_CN/mm/zsmalloc.rst
#	include/linux/pagevec.h
#	mm/internal.h

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/android/binder_alloc.h b/drivers/android/binder_alloc.h
index 7dea57a84c79..1e4fd37af5e0 100644
--- a/drivers/android/binder_alloc.h
+++ b/drivers/android/binder_alloc.h
@@ -100,7 +100,7 @@ struct binder_lru_page {
  */
 struct binder_alloc {
 	struct mutex mutex;
-	struct vm_area_struct *vma;
+	unsigned long vma_addr;
 	struct mm_struct *vma_vm_mm;
 	void __user *buffer;
 	struct list_head buffers;