diff options
| author | Mark Brown <broonie@kernel.org> | 2014-10-31 09:44:52 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-31 09:44:52 +0000 |
| commit | 5bca889af9ee712d0dac3b61b1cec79e7c99ec58 (patch) | |
| tree | f2cefd580d49799f5baac0593e6b70c1503410b2 /arch/arm64 | |
| parent | b7cd0dbce754d20e841b0c27c177ea91e96481f3 (diff) | |
| parent | cd2c5381cba9b0c40519b25841315621738688a0 (diff) | |
Merge tag 'v3.14.23' into linux-linaro-lsk-v3.14
This is the 3.14.23 stable release
Conflicts:
arch/s390/kvm/interrupt.c
Diffstat (limited to 'arch/arm64')
| -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; |