summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-03-07 17:43:58 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2019-03-07 17:43:58 -0800
commitf86727f8bd650b6b79bbbb7b0b57b3a43522a28e (patch)
treebf7e795fb8d613afb4b92910977b34e5a80f5574 /arch/x86/include/asm
parentd2cb698f6896d4b3fc6794142a902d2647f7dbae (diff)
parentad8cfb9c42ef83ecf4079bc7d77e6557648e952b (diff)
downloadlinux-0-day-f86727f8bd650b6b79bbbb7b0b57b3a43522a28e.tar.gz
linux-0-day-f86727f8bd650b6b79bbbb7b0b57b3a43522a28e.tar.xz
Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 mm cleanup from Ingo Molnar: "A single GUP cleanup" * 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: mm/gup: Remove the 'write' parameter from gup_fast_permitted()
Diffstat (limited to 'arch/x86/include/asm')
-rw-r--r--arch/x86/include/asm/pgtable_64.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
index 9c85b54bf03c..0bb566315621 100644
--- a/arch/x86/include/asm/pgtable_64.h
+++ b/arch/x86/include/asm/pgtable_64.h
@@ -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;