a7y18lte-ubports/android_kernel_samsung_a7y18lte
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix compile errors

Browse Source
This commit is contained in:
prashantpaddune 2020-04-08 14:18:09 +05:30
parent aba2d18cee
commit 1d0cb4645e
2 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gud/gud-exynos7885/MobiCoreDriver/main.h
View File

@ -101,12 +101,4 @@ ssize_t debug_generic_read(struct file *file, char __user *user_buf,
int (*function)(struct kasnprintf_buf *buf)); int (*function)(struct kasnprintf_buf *buf));
int debug_generic_open(struct inode *inode, struct file *file); int debug_generic_open(struct inode *inode, struct file *file);
int debug_generic_release(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
#endif /* _MC_MAIN_H_ */

5
drivers/staging/android/ashmem.c
View File

@ -365,13 +365,8 @@ static int ashmem_vmfile_mmap(struct file *file, struct vm_area_struct *vma)
static unsigned long static unsigned long
ashmem_vmfile_get_unmapped_area(struct file *file, unsigned long addr, 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 len, unsigned long pgoff,
unsigned long flags) unsigned long flags)
>>>>>>> a349db843c64... staging: android: ashmem: Disallow ashmem memory from being remapped
{ {
return current->mm->get_unmapped_area(file, addr, len, pgoff, flags); return current->mm->get_unmapped_area(file, addr, len, pgoff, flags);
} }