Commit:     aa7738a5f503abea5445cdd8cc2d501502c748ae
Parent:     d94afc6ccf6690b30ae112ec8101b3f10d50114e
Author:     Heiko Carstens <[EMAIL PROTECTED]>
AuthorDate: Fri Feb 8 04:18:39 2008 -0800
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Fri Feb 8 09:22:24 2008 -0800

    tty: let architectures override the user/kernel macros.
    Give architectures that support the new termios2 the possibilty to overide 
    user_termios_to_kernel_termios and kernel_termios_to_user_termios macros.  
    soon as all architectures that use the generic variant have been converted 
    ifdefs can go away again.  Architectures in question are avr32, frv, powerpc
    and s390.
    Cc: Alan Cox <[EMAIL PROTECTED]>
    Cc: Paul Mackerras <[EMAIL PROTECTED]>
    Cc: David Howells <[EMAIL PROTECTED]>
    Cc: Haavard Skinnemoen <[EMAIL PROTECTED]>
    Cc: Martin Schwidefsky <[EMAIL PROTECTED]>
    Signed-off-by: Heiko Carstens <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 include/asm-generic/termios.h |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/include/asm-generic/termios.h b/include/asm-generic/termios.h
index 33dca30..7d39ecc 100644
--- a/include/asm-generic/termios.h
+++ b/include/asm-generic/termios.h
@@ -61,8 +61,14 @@ static inline int kernel_termios_to_user_termio(struct 
termio __user *termio,
        return 0;
+#ifndef user_termios_to_kernel_termios
 #define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, 
sizeof(struct termios))
+#ifndef kernel_termios_to_user_termios
 #define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct 
 #define user_termios_to_kernel_termios_1(k, u) copy_from_user(k, u, 
sizeof(struct termios))
 #define kernel_termios_to_user_termios_1(u, k) copy_to_user(u, k, 
sizeof(struct termios))
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

Reply via email to