mirror of
https://github.com/Fishwaldo/build.git
synced 2025-07-23 21:39:02 +00:00
150ac0c2af
AR-1 - Adding support category for distributions AR-4 - Remove Allwinner legacy AR-5 - Drop Udoo family and move Udoo board into newly created imx6 family AR-9 - Rename sunxi-next to sunxi-legacy AR-10 - Rename sunxi-dev to sunxi-current AR-11 - Adding Radxa Rockpi S support AR-13 - Rename rockchip64-default to rockchip64-legacy AR-14 - Add rockchip64-current as mainline source AR-15 - Drop Rockchip 4.19.y NEXT, current become 5.3.y AR-16 - Rename RK3399 default to legacy AR-17 - Rename Odroid XU4 next and default to legacy 4.14.y, add DEV 5.4.y AR-18 - Add Odroid N2 current mainline AR-19 - Move Odroid C1 to meson family AR-20 - Rename mvebu64-default to mvebu64-legacy AR-21 - Rename mvebu-default to mvebu-legacy AR-22 - Rename mvebu-next to mvebu-current AR-23 - Drop meson64 default and next, current becomes former DEV 5.3.y AR-24 - Drop cubox family and move Cubox/Hummingboard boards under imx6 AR-26 - Adjust motd AR-27 - Enabling distribution release status AR-28 - Added new GCC compilers AR-29 - Implementing Ubuntu Eoan AR-30 - Add desktop packages per board or family AR-31 - Remove (Ubuntu/Debian) distribution name from image filename AR-32 - Move arch configs from configuration.sh to separate arm64 and armhf config files AR-33 - Revision numbers for beta builds changed to day_in_the_year AR-34 - Patches support linked patches AR-35 - Break meson64 family into gxbb and gxl AR-36 - Add Nanopineo2 Black AR-38 - Upgrade option from old branches to new one via armbian-config AR-41 - Show full timezone info AR-43 - Merge Odroid N2 to meson64 AR-44 - Enable FORCE_BOOTSCRIPT_UPDATE for all builds
46 lines
1.5 KiB
Diff
46 lines
1.5 KiB
Diff
From 63c110cdebc2c692964e1250c6f74f9e8c47c85d Mon Sep 17 00:00:00 2001
|
|
From: Myy <myy@miouyouyou.fr>
|
|
Date: Tue, 10 Jan 2017 04:28:48 +0000
|
|
Subject: [PATCH 4/5] Adapt get_user_pages calls to use the new calling
|
|
procedure
|
|
|
|
These changes are due to this commit:
|
|
mm: replace get_user_pages_remote() write/force parameters with gup_flags
|
|
9beae1ea89305a9667ceaab6d0bf46a045ad71e7
|
|
Kernel: 4.9.0-rc
|
|
|
|
Signed-off-by: Myy <myy@miouyouyou.fr>
|
|
---
|
|
drivers/base/ump/src/linux/ump_kernel_linux_mem.c | 8 ++++++++
|
|
1 file changed, 8 insertions(+)
|
|
|
|
diff --git a/drivers/base/ump/src/linux/ump_kernel_linux_mem.c b/drivers/base/ump/src/linux/ump_kernel_linux_mem.c
|
|
index 9186dd0..def4c0e 100644
|
|
--- a/drivers/base/ump/src/linux/ump_kernel_linux_mem.c
|
|
+++ b/drivers/base/ump/src/linux/ump_kernel_linux_mem.c
|
|
@@ -35,6 +35,10 @@
|
|
#include <ump_arch.h>
|
|
#include <common/ump_kernel_priv.h>
|
|
|
|
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,5,0))
|
|
+#include <linux/pfn_t.h>
|
|
+#endif
|
|
+
|
|
static void umpp_vm_close(struct vm_area_struct *vma)
|
|
{
|
|
umpp_cpu_mapping * mapping;
|
|
@@ -222,7 +226,11 @@ int umpp_linux_mmap(struct file * filp, struct vm_area_struct * vma)
|
|
paddr = alloc->block_array[block_idx].addr;
|
|
}
|
|
|
|
+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(4,4,0))
|
|
err = vm_insert_mixed(vma, vma->vm_start + (i << PAGE_SHIFT), paddr >> PAGE_SHIFT);
|
|
+#else
|
|
+ err = vm_insert_mixed(vma, vma->vm_start + (i << PAGE_SHIFT), __pfn_to_pfn_t(paddr >> PAGE_SHIFT, PFN_DEV));
|
|
+#endif
|
|
paddr += PAGE_SIZE;
|
|
}
|
|
|
|
--
|
|
2.10.2
|
|
|