diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-13 01:37:13 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-13 01:37:13 +0200 |
| commit | e18afa5bfa4a2f0e07b0864370485df701dacbc1 (patch) | |
| tree | ba2ad24758dccd2d34b7f5df4326c175c7beb7b0 /include/asm-generic | |
| parent | Merge branch 'work.iov_iter' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | quota: simplify the quotactl compat handling (diff) | |
| download | linux-e18afa5bfa4a2f0e07b0864370485df701dacbc1.tar.xz linux-e18afa5bfa4a2f0e07b0864370485df701dacbc1.zip | |
Merge branch 'work.quota-compat' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull compat quotactl cleanups from Al Viro:
"More Christoph's compat cleanups: quotactl(2)"
* 'work.quota-compat' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
quota: simplify the quotactl compat handling
compat: add a compat_need_64bit_alignment_fixup() helper
compat: lift compat_s64 and compat_u64 to <asm-generic/compat.h>
Diffstat (limited to 'include/asm-generic')
| -rw-r--r-- | include/asm-generic/compat.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/asm-generic/compat.h b/include/asm-generic/compat.h index a86f65bffab8..30f7b18a36f9 100644 --- a/include/asm-generic/compat.h +++ b/include/asm-generic/compat.h @@ -22,4 +22,12 @@ typedef u32 compat_ulong_t; typedef u32 compat_uptr_t; typedef u32 compat_aio_context_t; +#ifdef CONFIG_COMPAT_FOR_U64_ALIGNMENT +typedef s64 __attribute__((aligned(4))) compat_s64; +typedef u64 __attribute__((aligned(4))) compat_u64; +#else +typedef s64 compat_s64; +typedef u64 compat_u64; +#endif + #endif |