diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-08 02:43:58 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-08 02:43:58 +0100 |
| commit | f86727f8bd650b6b79bbbb7b0b57b3a43522a28e (patch) | |
| tree | bf7e795fb8d613afb4b92910977b34e5a80f5574 /arch/x86 | |
| parent | Merge branch 'x86-kdump-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | mm/gup: Remove the 'write' parameter from gup_fast_permitted() (diff) | |
| download | linux-f86727f8bd650b6b79bbbb7b0b57b3a43522a28e.tar.xz linux-f86727f8bd650b6b79bbbb7b0b57b3a43522a28e.zip | |
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')
| -rw-r--r-- | arch/x86/include/asm/pgtable_64.h | 3 |
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; |