From: Johannes Berg Date: Tue, 16 Apr 2013 07:46:59 +0000 (+0200) Subject: backports: protect vb2_mmap_pfn_range with LINUX_BACKPORT X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=be88f619a4386fa42e9a2b4420dd016ea8c265c1;p=openwrt%2Fstaging%2Fblogic.git 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 --- diff --git a/backport/backport-include/media/videobuf2-memops.h b/backport/backport-include/media/videobuf2-memops.h index 78ec8e4b65b3..49d0435865af 100644 --- 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 065601519aed..996e91c9ab28 100644 --- a/backport/compat/compat-3.9.c +++ b/backport/compat/compat-3.9.c @@ -14,6 +14,7 @@ #include #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)) +#include /** * vb2_mmap_pfn_range() - map physical pages to userspace * @vma: virtual memory region for the mapping