A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-28 18:51:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'work.get_user_pages_fast' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Browse source 
Pull get_user_pages_fast updates from Al Viro:
 "A bit more get_user_pages work"

* 'work.get_user_pages_fast' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  kvm: switch get_user_page_nowait() to get_user_pages_unlocked()
  __get_user_pages_locked(): get rid of notify_drop argument
  get_user_pages_unlocked(): pass true to __get_user_pages_locked() notify_drop
  cris: switch to get_user_pages_fast()
  fold __get_user_pages_unlocked() into its sole remaining caller
This commit is contained in:
Linus Torvalds 2018-01-31 10:01:08 -08:00
commit 5a87e37ee0
3 changed files with 34 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

23
arch/cris/arch-v32/drivers/cryptocop.c
View file

@ -2717,37 +2717,28 @@ static int cryptocop_ioctl_process(struct inode *inode, struct file *filp, unsig
}
}
/* Acquire the mm page semaphore. */
down_read(&current->mm->mmap_sem);
err = get_user_pages((unsigned long int)(oper.indata + prev_ix),
err = get_user_pages_fast((unsigned long)(oper.indata + prev_ix),
noinpages,
0, /* read access only for in data */
inpages,
NULL);
false, /* read access only for in data */
inpages);
if (err < 0) {
up_read(&current->mm->mmap_sem);
nooutpages = noinpages = 0;
DEBUG_API(printk("cryptocop_ioctl_process: get_user_pages indata\n"));
goto error_cleanup;
}
noinpages = err;
if (oper.do_cipher){
err = get_user_pages((unsigned long int)oper.cipher_outdata,
if (oper.do_cipher) {
err = get_user_pages_fast((unsigned long)oper.cipher_outdata,
nooutpages,
FOLL_WRITE, /* write access for out data */
outpages,
NULL);
up_read(&current->mm->mmap_sem);
true, /* write access for out data */
outpages);
if (err < 0) {
nooutpages = 0;
DEBUG_API(printk("cryptocop_ioctl_process: get_user_pages outdata\n"));
goto error_cleanup;
}
nooutpages = err;
} else {
up_read(&current->mm->mmap_sem);
}
/* Add 6 to nooutpages to make room for possibly inserted buffers for storing digest and