diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-10 14:43:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-10 14:43:37 -0700 |
| commit | 897ee77bfba12b83752027427a41009961458ee6 (patch) | |
| tree | 2caf21fd61ab29d5e5ac37e45ff70b55ceeff9c9 /include/asm-mips/termios.h | |
| parent | f3f94ce5dba6e134cf0958dd3a42ab28a028fc83 (diff) | |
| parent | 43863074659b71345b0047c2cf2ff8d8f7a4b4a1 (diff) | |
| download | kernel-crypto-897ee77bfba12b83752027427a41009961458ee6.tar.gz kernel-crypto-897ee77bfba12b83752027427a41009961458ee6.tar.xz kernel-crypto-897ee77bfba12b83752027427a41009961458ee6.zip | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Ocelot: remove remaining bits
[MIPS] TLB: Fix instruction bitmasks
[MIPS] R10000: Fix wrong test in dma-default.c
[MIPS] Provide empty irq_enable_hazard definition for legacy and R1 cores.
[MIPS] Sibyte: Remove broken dependency on EXPERIMENTAL from SIBYTE_SB1xxx_SOC.
[MIPS] Kconfig: whitespace cleanup.
[MIPS] PCI: Set need_domain_info if controller domain index is non-zero.
[MIPS] BCM1480: Fix computation of interrupt mask address register.
[MIPS] i8259: Add disable method.
[MIPS] tty: add the new ioctls and definitions.
Diffstat (limited to 'include/asm-mips/termios.h')
| -rw-r--r-- | include/asm-mips/termios.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/asm-mips/termios.h b/include/asm-mips/termios.h index 2ce07f4be36..a275661fa7e 100644 --- a/include/asm-mips/termios.h +++ b/include/asm-mips/termios.h @@ -122,8 +122,10 @@ struct termio { copy_to_user((termio)->c_cc, (termios)->c_cc, NCC); \ }) -#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 termios)) +#define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios2)) +#define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct termios2)) +#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 /* defined(__KERNEL__) */ |