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/qemu.h | |
| parent | afd3397a8149d8b645004e459bf2002d78f5e267 (diff) | |
| parent | b44316fb3610972e40849ec5710aeb42dfeba19d (diff) | |
| download | focaccia-qemu-f4718c033bfef80933bf3d1d5d6d35f8fae8b11d.tar.gz focaccia-qemu-f4718c033bfef80933bf3d1d5d6d35f8fae8b11d.zip | |
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/qemu.h')
| -rw-r--r-- | linux-user/qemu.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/linux-user/qemu.h b/linux-user/qemu.h index 4edd7d0c08..bc4bf35036 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h @@ -18,8 +18,6 @@ #include "exec/gdbstub.h" #include "qemu/queue.h" -#define THREAD __thread - /* This is the size of the host kernel's sigset_t, needed where we make * direct system calls that take a sigset_t pointer and a size. */ @@ -201,7 +199,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, abi_long arg5, abi_long arg6, abi_long arg7, abi_long arg8); void gemu_log(const char *fmt, ...) GCC_FMT_ATTR(1, 2); -extern THREAD CPUState *thread_cpu; +extern __thread CPUState *thread_cpu; void cpu_loop(CPUArchState *env); const char *target_strerror(int err); int get_osversion(void); |