diff options
| author | Paolo Bonzini <[email protected]> | 2015-11-24 18:34:40 +0000 |
|---|---|---|
| committer | Paolo Bonzini <[email protected]> | 2015-11-24 18:34:40 +0000 |
| commit | 8bd142c01648cdb33e9bcafa0448ba2c20ed814c (patch) | |
| tree | 9197c60d3f9d4036f38f281a183e94750ceea1d7 /drivers/tty/n_tty.c | |
| parent | Merge tag 'kvm-s390-master-4.4-1' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| parent | arm64: kvm: report original PAR_EL1 upon panic (diff) | |
| download | kernel-8bd142c01648cdb33e9bcafa0448ba2c20ed814c.tar.gz kernel-8bd142c01648cdb33e9bcafa0448ba2c20ed814c.zip | |
Merge tag 'kvm-arm-for-v4.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master
KVM/ARM Fixes for v4.4-rc3.
Includes some timer fixes, properly unmapping PTEs, an errata fix, and two
tweaks to the EL2 panic code.
Diffstat (limited to 'drivers/tty/n_tty.c')
| -rw-r--r-- | drivers/tty/n_tty.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c index 13844261cd5f..ed776149261e 100644 --- a/drivers/tty/n_tty.c +++ b/drivers/tty/n_tty.c @@ -169,7 +169,7 @@ static inline int tty_copy_to_user(struct tty_struct *tty, { struct n_tty_data *ldata = tty->disc_data; - tty_audit_add_data(tty, to, n, ldata->icanon); + tty_audit_add_data(tty, from, n, ldata->icanon); return copy_to_user(to, from, n); } |