From: Al Viro Date: Wed, 26 Apr 2017 16:06:59 +0000 (-0400) Subject: Merge branches 'uaccess.alpha', 'uaccess.arc', 'uaccess.arm', 'uaccess.arm64', 'uacce... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=eea86b637a15bc4d4bd518b11330ac96baa6b73d;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge branches 'uaccess.alpha', 'uaccess.arc', 'uaccess.arm', 'uaccess.arm64', 'uaccess.avr32', 'uaccess.bfin', 'uaccess.c6x', 'uaccess.cris', 'uaccess.frv', 'uaccess.h8300', 'uaccess.hexagon', 'uaccess.ia64', 'uaccess.m32r', 'uaccess.m68k', 'uaccess.metag', 'uaccess.microblaze', 'uaccess.mips', 'uaccess.mn10300', 'uaccess.nios2', 'uaccess.openrisc', 'uaccess.parisc', 'uaccess.powerpc', 'uaccess.s390', 'uaccess.score', 'uaccess.sh', 'uaccess.sparc', 'uaccess.tile', 'uaccess.um', 'uaccess.unicore32', 'uaccess.x86' and 'uaccess.xtensa' into work.uaccess --- eea86b637a15bc4d4bd518b11330ac96baa6b73d diff --cc arch/openrisc/include/asm/uaccess.h index 140faa16685a,227af1acb8bd,227af1acb8bd,227af1acb8bd,227af1acb8bd,227af1acb8bd,227af1acb8bd,227af1acb8bd,227af1acb8bd,227af1acb8bd,227af1acb8bd,227af1acb8bd,227af1acb8bd,227af1acb8bd,227af1acb8bd,227af1acb8bd,227af1acb8bd,227af1acb8bd,227af1acb8bd,227af1acb8bd,96fc425271c2,d6e7483b9d17,227af1acb8bd,227af1acb8bd,227af1acb8bd,227af1acb8bd,227af1acb8bd,227af1acb8bd,227af1acb8bd,227af1acb8bd,227af1acb8bd,227af1acb8bd..a557a7cd0232 --- a/arch/openrisc/include/asm/uaccess.h +++ b/arch/openrisc/include/asm/uaccess.h @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ -25,11 -25,6 -25,6 -25,6 -25,6 -25,6 -25,6 -25,6 -25,6 -25,6 -25,6 -25,6 -25,6 -25,6 -25,6 -25,6 -25,6 -25,6 -25,6 -25,6 -25,7 -25,6 -25,6 -25,6 -25,6 -25,6 -25,6 -25,6 -25,6 -25,6 -25,6 -25,6 +25,7 @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ #include #include #include - - #define VERIFY_READ 0 - #define VERIFY_WRITE 1 ++++++++++++++++++++ +++++++++++#include /* * The fs value determines whether argument validity checking should be