Commit:     b0052fcaefb829a29fdc6567274daf0b75329fc3
Parent:     0bc73c253ebb0430a6b6eb32765aac582fe263c5
Author:     Paul Mackerras <[EMAIL PROTECTED]>
AuthorDate: Thu Sep 13 01:16:31 2007 +1000
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Wed Sep 12 09:08:05 2007 -0700

    Define termios_1 functions for powerpc, s390, avr32 and frv
    Commit f629307c857c030d5a3dd777fee37c8bb395e171 introduced uses of
    kernel_termios_to_user_termios_1 and user_termios_to_kernel_termios_1
    on all architectures.  However, powerpc, s390, avr32 and frv don't
    currently define those functions since their termios struct didn't
    need to be changed when the arbitrary baud rate stuff was added, and
    thus the kernel won't currently build on those architectures.
    This adds definitions of kernel_termios_to_user_termios_1 and
    user_termios_to_kernel_termios_1 to include/asm-generic/termios.h
    which are identical to kernel_termios_to_user_termios and
    user_termios_to_kernel_termios respectively.  The definitions are the
    same because the "old" termios and "new" termios are in fact the same
    on these architectures (which are the same ones that use
    Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
    Cc: Andrew Morton <[EMAIL PROTECTED]>
    Cc: Alan Cox <[EMAIL PROTECTED]>
    Cc: David Miller <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 include/asm-generic/termios.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/include/asm-generic/termios.h b/include/asm-generic/termios.h
index 3769e6b..33dca30 100644
--- a/include/asm-generic/termios.h
+++ b/include/asm-generic/termios.h
@@ -63,6 +63,8 @@ static inline int kernel_termios_to_user_termio(struct termio 
__user *termio,
 #define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, 
sizeof(struct 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))
 #endif /* __ARCH_TERMIO_GETPUT */
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