diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-02-20 09:40:51 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-02-20 09:40:51 +0000 |
| commit | f4718c033bfef80933bf3d1d5d6d35f8fae8b11d (patch) | |
| tree | c93eab3dee6b3506b00c456d1d5db26dc0f94230 /linux-user/microblaze/termbits.h | |
| parent | afd3397a8149d8b645004e459bf2002d78f5e267 (diff) | |
| parent | b44316fb3610972e40849ec5710aeb42dfeba19d (diff) | |
Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-2.12-pull-request' into staging
# gpg: Signature made Tue 20 Feb 2018 09:16:18 GMT
# gpg: using RSA key F30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>"
# gpg: aka "Laurent Vivier <laurent@vivier.eu>"
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>"
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C
* remotes/vivier2/tags/linux-user-for-2.12-pull-request:
linux-user: Remove THREAD macro
linux-user: Fix sched_getaffinity mask size
linux-user: Fix register used for 6th and 7th syscall argument on aarch64
linux-user: Implement ioctl cmd TIOCGPTPEER
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/microblaze/termbits.h')
| -rw-r--r-- | linux-user/microblaze/termbits.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linux-user/microblaze/termbits.h b/linux-user/microblaze/termbits.h index fc82ca084e..c825cd2f5e 100644 --- a/linux-user/microblaze/termbits.h +++ b/linux-user/microblaze/termbits.h @@ -182,6 +182,7 @@ struct target_termios { #define TARGET_TIOCGSID 0x5429 /* Return the session ID of FD */ #define TARGET_TIOCGPTN TARGET_IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ #define TARGET_TIOCSPTLCK TARGET_IOW('T',0x31, int) /* Lock/unlock Pty */ +#define TARGET_TIOCGPTPEER TARGET_IO('T', 0x41) /* Safely open the slave */ #define TARGET_FIONCLEX 0x5450 /* these numbers need to be adjusted. */ #define TARGET_FIOCLEX 0x5451 |