Commit ad8cfb9c authored by Ira Weiny's avatar Ira Weiny Committed by Ingo Molnar
Browse files

mm/gup: Remove the 'write' parameter from gup_fast_permitted() 



The 'write' parameter is unused in gup_fast_permitted() so remove it.

Signed-off-by: default avatarIra Weiny <ira.weiny@intel.com>
Acked-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Reviewed-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: linux-mm@kvack.org
Link: http://lkml.kernel.org/r/20190210223424.13934-1-ira.weiny@intel.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent d1393711

arch/x86/include/asm/pgtable_64.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -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);

extern void init_extra_mapping_wb(unsigned long phys, unsigned long size);





#define gup_fast_permitted gup_fast_permitted

#define gup_fast_permitted gup_fast_permitted

static inline bool gup_fast_permitted(unsigned long start, int nr_pages,

static inline bool gup_fast_permitted(unsigned long start, int nr_pages)

		int write)

{

{

	unsigned long len, end;

	unsigned long len, end;

mm/gup.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -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

 * Check if it's allowed to use __get_user_pages_fast() for the range, or

 * we need to fall back to the slow version:

 * 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;

	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.

	 * 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);

		local_irq_save(flags);

		gup_pgd_range(start, end, write, pages, &nr);

		gup_pgd_range(start, end, write, pages, &nr);

		local_irq_restore(flags);

		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)))

	if (unlikely(!access_ok((void __user *)start, len)))

		return -EFAULT;

		return -EFAULT;





	if (gup_fast_permitted(start, nr_pages, write)) {

	if (gup_fast_permitted(start, nr_pages)) {

		local_irq_disable();

		local_irq_disable();

		gup_pgd_range(addr, end, write, pages, &nr);

		gup_pgd_range(addr, end, write, pages, &nr);

		local_irq_enable();

		local_irq_enable();

CRA Git | Maintained and supported by SUSTech CRA and CCSE