xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'parisc-4.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux

Browse Source 
Pull parisc fixes and cleanups from Helge Deller:
 "Nothing really important in this patchset: fix resource leaks in error
  paths, coding style cleanups and code removal"

* 'parisc-4.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Remove flush_user_dcache_range and flush_user_icache_range
  parisc: fix a printk
  parisc: ccio-dma: Handle return NULL error from ioremap_nocache
  parisc: Define access_ok() as macro
  parisc: eisa: Fix resource leaks in error paths
  parisc: eisa: Remove coding style errors
This commit is contained in:
Linus Torvalds
2017-03-03 16:20:06 -08:00
parent 606ed721af ef470a60e1
commit f47e2db43d
7 changed files with 83 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/parisc/include/asm/cacheflush.h
View File

@@ -27,8 +27,6 @@ void flush_user_dcache_range_asm(unsigned long, unsigned long);
void flush_kernel_dcache_range_asm(unsigned long, unsigned long);
void flush_kernel_dcache_page_asm(void *);
void flush_kernel_icache_page(void *);
void flush_user_dcache_range(unsigned long, unsigned long);
void flush_user_icache_range(unsigned long, unsigned long);
/* Cache flush operations */

6
arch/parisc/include/asm/uaccess.h
View File

@@ -32,11 +32,7 @@
* that put_user is the same as __put_user, etc.
*/
static inline long access_ok(int type, const void __user * addr,
unsigned long size)
{
return 1;
}
#define access_ok(type, uaddr, size) (1)
#define put_user __put_user
#define get_user __get_user