backports: protect vb2_mmap_pfn_range with LINUX_BACKPORT

Some kernels apparently have this backported, and it doesn't
hurt to protect the symbol since we patch it in anyway for
those files needing it.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/backport/backport-include/media/videobuf2-memops.h b/backport/backport-include/media/videobuf2-memops.h
index 78ec8e4b65b38aec5e2db6a44df3268b7d6c2eb3..49d0435865af03f175911ab1ad19a89beff1c6c7 100644 (file)
--- a/backport/backport-include/media/videobuf2-memops.h
+++ b/backport/backport-include/media/videobuf2-memops.h
@@ -5,6 +5,7 @@
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(3,9,0) && \
     LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)
+#define vb2_mmap_pfn_range LINUX_BACKPORT(vb2_mmap_pfn_range)
 int vb2_mmap_pfn_range(struct vm_area_struct *vma, unsigned long paddr,
                                unsigned long size,
                                const struct vm_operations_struct *vm_ops,

diff --git a/backport/compat/compat-3.9.c b/backport/compat/compat-3.9.c
index 065601519aed2f42b327d38f202c518db045ff35..996e91c9ab28235505722aa55d5ced2d46932b9a 100644 (file)
--- a/backport/compat/compat-3.9.c
+++ b/backport/compat/compat-3.9.c
@@ -14,6 +14,7 @@
 #include <linux/err.h>
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0))
+#include <media/videobuf2-memops.h>
 /**
  * vb2_mmap_pfn_range() - map physical pages to userspace
  * @vma:       virtual memory region for the mapping