| commit | 2b650df2cea96e487f2fd9ecaa68e533ea9b5ed7 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Oct 15 15:06:02 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Oct 15 15:06:02 2009 -0700 |
| tree | 6019e79893431de1109094651f57a690b6f5a0eb | |
| parent | e7957ec6b6edf7838c7d7506669ffb6e28ec481b [diff] | |
| parent | 4b1fe7797270e866adc17fc603bddf8768bc187f [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: tty: fix vt_compat_ioctl
diff --git a/drivers/char/vt_ioctl.c b/drivers/char/vt_ioctl.c index 6b36ee5..ed86d3b 100644 --- a/drivers/char/vt_ioctl.c +++ b/drivers/char/vt_ioctl.c
@@ -1532,7 +1532,7 @@ case PIO_UNIMAP: case GIO_UNIMAP: - ret = do_unimap_ioctl(cmd, up, perm, vc); + ret = compat_unimap_ioctl(cmd, up, perm, vc); break; /*