From 1d0cb4645e03c188258d914bc898296d2b600257 Mon Sep 17 00:00:00 2001 From: prashantpaddune Date: Wed, 8 Apr 2020 14:18:09 +0530 Subject: [PATCH] fix compile errors --- drivers/gud/gud-exynos7885/MobiCoreDriver/main.h | 8 -------- drivers/staging/android/ashmem.c | 5 ----- 2 files changed, 13 deletions(-) diff --git a/drivers/gud/gud-exynos7885/MobiCoreDriver/main.h b/drivers/gud/gud-exynos7885/MobiCoreDriver/main.h index 6717fc574..b89342271 100644 --- a/drivers/gud/gud-exynos7885/MobiCoreDriver/main.h +++ b/drivers/gud/gud-exynos7885/MobiCoreDriver/main.h @@ -101,12 +101,4 @@ ssize_t debug_generic_read(struct file *file, char __user *user_buf, int (*function)(struct kasnprintf_buf *buf)); int debug_generic_open(struct inode *inode, struct file *file); int debug_generic_release(struct inode *inode, struct file *file); - -#if KERNEL_VERSION(4, 11, 0) > LINUX_VERSION_CODE -static inline unsigned int kref_read(struct kref *kref) -{ - return atomic_read(&kref->refcount); -} #endif - -#endif /* _MC_MAIN_H_ */ diff --git a/drivers/staging/android/ashmem.c b/drivers/staging/android/ashmem.c index 7528650eb..37cb58804 100644 --- a/drivers/staging/android/ashmem.c +++ b/drivers/staging/android/ashmem.c @@ -365,13 +365,8 @@ static int ashmem_vmfile_mmap(struct file *file, struct vm_area_struct *vma) static unsigned long ashmem_vmfile_get_unmapped_area(struct file *file, unsigned long addr, -<<<<<<< HEAD - unsigned long len, unsigned long pgoff, - unsigned long flags) -======= unsigned long len, unsigned long pgoff, unsigned long flags) ->>>>>>> a349db843c64... staging: android: ashmem: Disallow ashmem memory from being remapped { return current->mm->get_unmapped_area(file, addr, len, pgoff, flags); }