The patch titled tty: let architectures override the user/kernel macros. has been removed from the -mm tree. Its filename was tty-let-architectures-override-the-user-kernel-macros.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: tty: let architectures override the user/kernel macros. From: Heiko Carstens <heiko.carstens@xxxxxxxxxx> 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@xxxxxxxxxxxxxxxxxxx> Cc: Paul Mackerras <paulus@xxxxxxxxx> Cc: David Howells <dhowells@xxxxxxxxxx> Cc: Haavard Skinnemoen <hskinnemoen@xxxxxxxxx> Cc: Martin Schwidefsky <schwidefsky@xxxxxxxxxx> Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/asm-generic/termios.h | 6 ++++++ 1 file changed, 6 insertions(+) diff -puN include/asm-generic/termios.h~tty-let-architectures-override-the-user-kernel-macros include/asm-generic/termios.h --- a/include/asm-generic/termios.h~tty-let-architectures-override-the-user-kernel-macros +++ a/include/asm-generic/termios.h @@ -61,8 +61,14 @@ static inline int kernel_termios_to_user return 0; } +#ifndef user_termios_to_kernel_termios #define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios)) +#endif + +#ifndef kernel_termios_to_user_termios #define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct termios)) +#endif + #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)) _ Patches currently in -mm which might be from heiko.carstens@xxxxxxxxxx are origin.patch git-sched.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html