Introduce compat_u64 and compat_s64 types

One common problem with 32 bit system call and ioctl emulation is the
different alignment rules between i386 and 64 bit machines.  A number of
drivers work around this by marking the compat structures as
'attribute((packed))', which is not the right solution because it breaks
all the non-x86 architectures that want to use the same compat code.

Hopefully, this patch improves the situation, it introduces two new types,
compat_u64 and compat_s64.  These are defined on all architectures to have
the same size and alignment as the 32 bit version of u64 and s64.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: David S. Miller <davem@davemloft.net>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Andi Kleen <ak@suse.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Vasily Tarasov <vtaras@openvz.org>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/include/asm-ia64/compat.h b/include/asm-ia64/compat.h
index 40d01d80610d0c148019ce77b9f4e37a553a65f8..0f6e5264ab8fcccefa2da67faa794fec3d79d206 100644 (file)
--- a/include/asm-ia64/compat.h
+++ b/include/asm-ia64/compat.h
@@ -31,8 +31,10 @@ typedef s32          compat_timer_t;
 
 typedef s32            compat_int_t;
 typedef s32            compat_long_t;
+typedef s64 __attribute__((aligned(4))) compat_s64;
 typedef u32            compat_uint_t;
 typedef u32            compat_ulong_t;
+typedef u64 __attribute__((aligned(4))) compat_u64;
 
 struct compat_timespec {
        compat_time_t   tv_sec;

diff --git a/include/asm-mips/compat.h b/include/asm-mips/compat.h
index 67c3f8ec0303bba4e95fdf1eb00b9638d51d62ac..568c76cdd9000aed94b2d7970bbfdb2f446d6973 100644 (file)
--- a/include/asm-mips/compat.h
+++ b/include/asm-mips/compat.h
@@ -37,8 +37,10 @@ typedef s32          compat_key_t;
 
 typedef s32            compat_int_t;
 typedef s32            compat_long_t;
+typedef s64            compat_s64;
 typedef u32            compat_uint_t;
 typedef u32            compat_ulong_t;
+typedef u64            compat_u64;
 
 struct compat_timespec {
        compat_time_t   tv_sec;

diff --git a/include/asm-parisc/compat.h b/include/asm-parisc/compat.h
index 11f4222597a067c1f9c41b60b222078d0bf4dfc9..5a85d1b025c810de6e881931ce0ae3a38574216c 100644 (file)
--- a/include/asm-parisc/compat.h
+++ b/include/asm-parisc/compat.h
@@ -31,8 +31,10 @@ typedef s32  compat_timer_t;
 
 typedef s32    compat_int_t;
 typedef s32    compat_long_t;
+typedef s64    compat_s64;
 typedef u32    compat_uint_t;
 typedef u32    compat_ulong_t;
+typedef u64    compat_u64;
 
 struct compat_timespec {
        compat_time_t           tv_sec;

diff --git a/include/asm-powerpc/compat.h b/include/asm-powerpc/compat.h
index aacaabd28ac10ddcc7175a5cf7fbe293be7205f9..64ab1ddbdf85c5d2cba8ca73750b873b43040a4d 100644 (file)
--- a/include/asm-powerpc/compat.h
+++ b/include/asm-powerpc/compat.h
@@ -33,8 +33,10 @@ typedef s32          compat_timer_t;
 
 typedef s32            compat_int_t;
 typedef s32            compat_long_t;
+typedef s64            compat_s64;
 typedef u32            compat_uint_t;
 typedef u32            compat_ulong_t;
+typedef u64            compat_u64;
 
 struct compat_timespec {
        compat_time_t   tv_sec;

diff --git a/include/asm-s390/compat.h b/include/asm-s390/compat.h
index 296f4f1a20e1a2f8a79c89210091316348141f46..7f4ad623f7d5d93a2f423cd76898c1df52883a51 100644 (file)
--- a/include/asm-s390/compat.h
+++ b/include/asm-s390/compat.h
@@ -60,8 +60,10 @@ typedef s32          compat_timer_t;
 
 typedef s32            compat_int_t;
 typedef s32            compat_long_t;
+typedef s64            compat_s64;
 typedef u32            compat_uint_t;
 typedef u32            compat_ulong_t;
+typedef u64            compat_u64;
 
 struct compat_timespec {
        compat_time_t   tv_sec;

diff --git a/include/asm-sparc64/compat.h b/include/asm-sparc64/compat.h
index 36511ca514165b4307033de76e7b09db646509c1..01fe6682b4054237ee55d8d4418310aaf68947cd 100644 (file)
--- a/include/asm-sparc64/compat.h
+++ b/include/asm-sparc64/compat.h
@@ -31,8 +31,10 @@ typedef s32          compat_timer_t;
 
 typedef s32            compat_int_t;
 typedef s32            compat_long_t;
+typedef s64            compat_s64;
 typedef u32            compat_uint_t;
 typedef u32            compat_ulong_t;
+typedef u64            compat_u64;
 
 struct compat_timespec {
        compat_time_t   tv_sec;

diff --git a/include/asm-x86_64/compat.h b/include/asm-x86_64/compat.h
index b37ab8218ef03634e90d5dd8d59b2546e088481c..53cb96b68a62bcb1f040e78381e9e9e562cbb0f8 100644 (file)
--- a/include/asm-x86_64/compat.h
+++ b/include/asm-x86_64/compat.h
@@ -33,8 +33,10 @@ typedef s32          compat_key_t;
 
 typedef s32            compat_int_t;
 typedef s32            compat_long_t;
+typedef s64 __attribute__((aligned(4))) compat_s64;
 typedef u32            compat_uint_t;
 typedef u32            compat_ulong_t;
+typedef u64 __attribute__((aligned(4))) compat_u64;
 
 struct compat_timespec {
        compat_time_t   tv_sec;