From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 11 Sep 2015 23:42:39 +0000 (-0700)
Subject: Merge tag 'media/v4.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab... 
X-Git-Tag: v4.14-rc1~4693
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=06a660ada2064bbdcd09aeb8173f2ad128c71978;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'media/v4.3-2' of git://git./linux/kernel/git/mchehab/linux-media

Pull media updates from Mauro Carvalho Chehab:
 "A series of patches that move part of the code used to allocate memory
  from the media subsystem to the mm subsystem"

[ The mm parts have been acked by VM people, and the series was
  apparently in -mm for a while   - Linus ]

* tag 'media/v4.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  [media] drm/exynos: Convert g2d_userptr_get_dma_addr() to use get_vaddr_frames()
  [media] media: vb2: Remove unused functions
  [media] media: vb2: Convert vb2_dc_get_userptr() to use frame vector
  [media] media: vb2: Convert vb2_vmalloc_get_userptr() to use frame vector
  [media] media: vb2: Convert vb2_dma_sg_get_userptr() to use frame vector
  [media] vb2: Provide helpers for mapping virtual addresses
  [media] media: omap_vout: Convert omap_vout_uservirt_to_phys() to use get_vaddr_pfns()
  [media] mm: Provide new get_vaddr_frames() helper
  [media] vb2: Push mmap_sem down to memops
---

06a660ada2064bbdcd09aeb8173f2ad128c71978
diff --cc include/media/videobuf2-memops.h
index 9f36641,830b523..6513c7e
--- a/include/media/videobuf2-memops.h
+++ b/include/media/videobuf2-memops.h
@@@ -15,10 -15,10 +15,11 @@@
  #define _MEDIA_VIDEOBUF2_MEMOPS_H
  
  #include <media/videobuf2-core.h>
+ #include <linux/mm.h>
  
  /**
 - * vb2_vmarea_handler - common vma refcount tracking handler
 + * struct vb2_vmarea_handler - common vma refcount tracking handler
 + *
   * @refcount:	pointer to refcount entry in the buffer
   * @put:	callback to function that decreases buffer refcount
   * @arg:	argument for @put callback
diff --cc mm/Kconfig
index 6413d02,7f146dd..0d9fdcd
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@@ -649,31 -655,5 +649,34 @@@ config DEFERRED_STRUCT_PAGE_INI
  	  processes running early in the lifetime of the systemm until kswapd
  	  finishes the initialisation.
  
 +config IDLE_PAGE_TRACKING
 +	bool "Enable idle page tracking"
 +	depends on SYSFS && MMU
 +	select PAGE_EXTENSION if !64BIT
 +	help
 +	  This feature allows to estimate the amount of user pages that have
 +	  not been touched during a given period of time. This information can
 +	  be useful to tune memory cgroup limits and/or for job placement
 +	  within a compute cluster.
 +
 +	  See Documentation/vm/idle_page_tracking.txt for more details.
 +
 +config ZONE_DEVICE
 +	bool "Device memory (pmem, etc...) hotplug support" if EXPERT
 +	default !ZONE_DMA
 +	depends on !ZONE_DMA
 +	depends on MEMORY_HOTPLUG
 +	depends on MEMORY_HOTREMOVE
 +	depends on X86_64 #arch_add_memory() comprehends device memory
 +
 +	help
 +	  Device memory hotplug support allows for establishing pmem,
 +	  or other device driver discovered memory regions, in the
 +	  memmap. This allows pfn_to_page() lookups of otherwise
 +	  "device-physical" addresses which is needed for using a DAX
 +	  mapping in an O_DIRECT operation, among other things.
 +
 +	  If FS_DAX is enabled, then say Y.
++
+ config FRAME_VECTOR
+ 	bool
diff --cc mm/Makefile
index 56f8eed,be5d5c8..2ed4319
--- a/mm/Makefile
+++ b/mm/Makefile
@@@ -78,5 -78,4 +78,6 @@@ obj-$(CONFIG_CMA)	+= cma.
  obj-$(CONFIG_MEMORY_BALLOON) += balloon_compaction.o
  obj-$(CONFIG_PAGE_EXTENSION) += page_ext.o
  obj-$(CONFIG_CMA_DEBUGFS) += cma_debug.o
 +obj-$(CONFIG_USERFAULTFD) += userfaultfd.o
 +obj-$(CONFIG_IDLE_PAGE_TRACKING) += page_idle.o
+ obj-$(CONFIG_FRAME_VECTOR) += frame_vector.o