Commit aa7738a5f503abea5445cdd8cc2d501502c748ae

Authored by Heiko Carstens
Committed by Linus Torvalds
1 parent d94afc6ccf

tty: let architectures override the user/kernel macros.

Give architectures that support the new termios2 the possibilty to overide the
user_termios_to_kernel_termios and kernel_termios_to_user_termios macros.  As
soon as all architectures that use the generic variant have been converted the
ifdefs can go away again.  Architectures in question are avr32, frv, powerpc
and s390.

Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Paul Mackerras <paulus@samba.org>
Cc: David Howells <dhowells@redhat.com>
Cc: Haavard Skinnemoen <hskinnemoen@atmel.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 6 additions and 0 deletions Side-by-side Diff

include/asm-generic/termios.h
... ... @@ -61,8 +61,14 @@
61 61 return 0;
62 62 }
63 63  
  64 +#ifndef user_termios_to_kernel_termios
64 65 #define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios))
  66 +#endif
  67 +
  68 +#ifndef kernel_termios_to_user_termios
65 69 #define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct termios))
  70 +#endif
  71 +
66 72 #define user_termios_to_kernel_termios_1(k, u) copy_from_user(k, u, sizeof(struct termios))
67 73 #define kernel_termios_to_user_termios_1(u, k) copy_to_user(u, k, sizeof(struct termios))
68 74