diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-09-09 21:54:49 +0300 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-09-09 21:54:49 +0300 |
| commit | a7eab7885a30dfeed5917eaf3c72f962682a56d9 (patch) | |
| tree | fda986976bad7f72986e4bd742e94c2d9f82c19f /arch/arm64/include/asm/unistd.h | |
| parent | af3fc97a799070a5c341acd344cbfce770c6a646 (diff) | |
| parent | 9b4db147ac19c2320edec431d93193f42e32d425 (diff) | |
Automatically merging tracking-ilp32 into merge-linux-linaroll-20150909.0
Conflicting files:
Diffstat (limited to 'arch/arm64/include/asm/unistd.h')
| -rw-r--r-- | arch/arm64/include/asm/unistd.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/unistd.h b/arch/arm64/include/asm/unistd.h index 3bc498c250dc..10397e852b54 100644 --- a/arch/arm64/include/asm/unistd.h +++ b/arch/arm64/include/asm/unistd.h @@ -13,7 +13,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef CONFIG_COMPAT +#ifdef CONFIG_ARM64_ILP32 +#define __ARCH_WANT_COMPAT_SYS_PREADV64 +#define __ARCH_WANT_COMPAT_SYS_PWRITEV64 +#endif +#ifdef CONFIG_AARCH32_EL0 #define __ARCH_WANT_COMPAT_SYS_GETDENTS64 #define __ARCH_WANT_COMPAT_STAT64 #define __ARCH_WANT_SYS_GETHOSTNAME |