x86/mm change for v5.1
Subsystems (3)
Linus,
Please pull the latest x86-mm-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-mm-for-linus
# HEAD: ad8cfb9c42ef83ecf4079bc7d77e6557648e952b mm/gup: Remove the 'write' parameter from gup_fast_permitted()
A single GUP cleanup.
out-of-topic modifications in x86-mm-for-linus:
-------------------------------------------------
mm/gup.c # ad8cfb9c42ef: mm/gup: Remove the 'write' p
Thanks,
Ingo
------------------>
Ira Weiny (1):
mm/gup: Remove the 'write' parameter from gup_fast_permitted()
arch/x86/include/asm/pgtable_64.h | 3 +-- mm/gup.c | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-)
arch/x86/include/asm/pgtable_64.h +1 -2
@@ -259,8 +259,7 @@ extern void init_extra_mapping_uc(unsigned long phys, unsigned long size);extern void init_extra_mapping_wb (unsigned long phys,unsigned long size);#define gup_fast_permitted gup_fast_permitted -static inline bool gup_fast_permitted (unsigned long start,int nr_pages, -int write) +static inline bool gup_fast_permitted (unsigned long start,int nr_pages) {unsigned long len, end;
mm/gup.c +3 -3
@@ -1786,7 +1786,7 @@ static void gup_pgd_range(unsigned long addr, unsigned long end,* Check if it's allowed to use __get_user_pages_fast() for the range, or * we need to fall back to the slow version: */ -bool gup_fast_permitted (unsigned long start,int nr_pages,int write) +bool gup_fast_permitted (unsigned long start,int nr_pages) {unsigned long len, end;
@@ -1828,7 +1828,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write,* block IPIs that come from THPs splitting. */ -if (gup_fast_permitted (start, nr_pages, write)) { +if (gup_fast_permitted (start, nr_pages)) {local_irq_save (flags);gup_pgd_range (start, end, write, pages, &nr);local_irq_restore (flags);
@@ -1870,7 +1870,7 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write,if (unlikely (!access_ok ((void __user *)start, len)))return -EFAULT ; -if (gup_fast_permitted (start, nr_pages, write)) { +if (gup_fast_permitted (start, nr_pages)) {local_irq_disable ();gup_pgd_range (addr, end, write, pages, &nr);local_irq_enable ();
The pull request you sent on Thu, 7 Mar 2019 20:54:00 +0100:
The pull request you sent on Thu, 7 Mar 2019 20:54:00 +0100:
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.gitx86-mm-for-linus
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/f86727f8bd650b6b79bbbb7b0b57b3a43522a28e
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/prtracker