diff options
| author | Mark Brown <broonie@kernel.org> | 2014-10-31 09:45:01 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-31 09:45:01 +0000 |
| commit | 8b2e026be184833ed76c622c8516b989ae438a4f (patch) | |
| tree | 1b6aec62118ce8ba8be2f9b317a8ce0b71de9886 /arch/arm64/include | |
| parent | 31581bd8dd68b38294852bbb9032173ba2cac1ab (diff) | |
| parent | ff114805e1dc9b64c1f2e02fbb07a6ed309b18d8 (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Diffstat (limited to 'arch/arm64/include')
| -rw-r--r-- | arch/arm64/include/asm/compat.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/include/asm/compat.h b/arch/arm64/include/asm/compat.h index 253e33bc94fb..56de5aadede2 100644 --- a/arch/arm64/include/asm/compat.h +++ b/arch/arm64/include/asm/compat.h @@ -37,8 +37,8 @@ typedef s32 compat_ssize_t; typedef s32 compat_time_t; typedef s32 compat_clock_t; typedef s32 compat_pid_t; -typedef u32 __compat_uid_t; -typedef u32 __compat_gid_t; +typedef u16 __compat_uid_t; +typedef u16 __compat_gid_t; typedef u16 __compat_uid16_t; typedef u16 __compat_gid16_t; typedef u32 __compat_uid32_t; |