Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=4b7775870b69129e640ed583c9b362d5cd66159d
Commit:     4b7775870b69129e640ed583c9b362d5cd66159d
Parent:     6d9525b52aecd11b14c4ec982add01c11157172f
Author:     Arnd Bergmann <[EMAIL PROTECTED]>
AuthorDate: Sun Jul 15 23:41:11 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Mon Jul 16 09:05:48 2007 -0700

    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 <[EMAIL PROTECTED]>
    Acked-by: David S. Miller <[EMAIL PROTECTED]>
    Cc: David Woodhouse <[EMAIL PROTECTED]>
    Cc: Andi Kleen <[EMAIL PROTECTED]>
    Cc: Benjamin Herrenschmidt <[EMAIL PROTECTED]>
    Cc: Vasily Tarasov <[EMAIL PROTECTED]>
    Cc: <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 include/asm-ia64/compat.h    |    2 ++
 include/asm-mips/compat.h    |    2 ++
 include/asm-parisc/compat.h  |    2 ++
 include/asm-powerpc/compat.h |    2 ++
 include/asm-s390/compat.h    |    2 ++
 include/asm-sparc64/compat.h |    2 ++
 include/asm-x86_64/compat.h  |    2 ++
 7 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/include/asm-ia64/compat.h b/include/asm-ia64/compat.h
index 40d01d8..0f6e526 100644
--- 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 67c3f8e..568c76c 100644
--- 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 11f4222..5a85d1b 100644
--- 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 aacaabd..64ab1dd 100644
--- 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 296f4f1..7f4ad62 100644
--- 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 36511ca..01fe668 100644
--- 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 b37ab82..53cb96b 100644
--- 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;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to