diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-09-19 20:09:27 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-09-19 20:09:27 -0400 |
| commit | 0ce49a3945474fc942ec37c0c0efece60f592f80 (patch) | |
| tree | f42b821b2d9e2d8775bc22f56d444c2cc7b7b7dd /include/asm-xtensa/termios.h | |
| parent | 9e4859ef5462193643fd2b3c8ffb298e5a4a4319 (diff) | |
| parent | a88a8eff1e6e32d3288986a9d36c6a449c032d3a (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'include/asm-xtensa/termios.h')
| -rw-r--r-- | include/asm-xtensa/termios.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/asm-xtensa/termios.h b/include/asm-xtensa/termios.h index f14b42c8dac0..4673f42f88a7 100644 --- a/include/asm-xtensa/termios.h +++ b/include/asm-xtensa/termios.h | |||
| @@ -95,8 +95,10 @@ struct termio { | |||
| 95 | copy_to_user((termio)->c_cc, (termios)->c_cc, NCC); \ | 95 | copy_to_user((termio)->c_cc, (termios)->c_cc, NCC); \ |
| 96 | }) | 96 | }) |
| 97 | 97 | ||
| 98 | #define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios)) | 98 | #define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios2)) |
| 99 | #define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct termios)) | 99 | #define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct termios2)) |
| 100 | #define user_termios_to_kernel_termios_1(k, u) copy_from_user(k, u, sizeof(struct termios)) | ||
| 101 | #define kernel_termios_to_user_termios_1(u, k) copy_to_user(u, k, sizeof(struct termios)) | ||
| 100 | 102 | ||
| 101 | #endif /* __KERNEL__ */ | 103 | #endif /* __KERNEL__ */ |
| 102 | 104 | ||