Merge remote-tracking branch 'riku/linux-user-for-upstream' into staging

* riku/linux-user-for-upstream: (21 commits)
  linux-user: Handle compressed ISA encodings when processing MIPS exceptions
  linux-user: Unlock mmap_lock when resuming guest from page_unprotect
  linux-user: Reset copied CPUs in cpu_copy() always
  linux-user: Fix epoll on ARM hosts
  linux-user: fix segmentation fault passing with h2g(x) != x
  linux-user: Fix pipe syscall return for SPARC
  linux-user: Fix target_stat and target_stat64 for OpenRISC
  linux-user: Avoid conditional cpu_reset()
  configure: Make NPTL non-optional
  linux-user: Enable NPTL for x86-64
  linux-user: Add i386 TLS setter
  linux-user: Clean up handling of clone() argument order
  linux-user: Add missing 'break' in i386 get_thread_area syscall
  linux-user: Enable NPTL for m68k
  linux-user: Enable NPTL for SPARC targets
  linux-user: Enable NPTL for OpenRISC
  linux-user: Move includes of target-specific headers to end of qemu.h
  configure: Enable threading for unicore32-linux-user
  configure: Enable threading on all ppc and mips linux-user targets
  configure: Don't say target_nptl="no" if there is no linux-user target
  ...

Conflicts:
	linux-user/main.c

Signed-off-by: Anthony Liguori <[email protected]>

diff --cc configure
index 877a8213f38a677243f15149ca299cf6662a16fa,9d9088ebd61798161c1533dcef79234b99e9ec3e..3d83e168bc3286281cef09349683227fa9db4ba0
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -1100,11 -1090,7 +1095,9 @@@ echo "  --enable-bluez           enabl
  echo "  --disable-slirp          disable SLIRP userspace network connectivity"
  echo "  --disable-kvm            disable KVM acceleration support"
  echo "  --enable-kvm             enable KVM acceleration support"
 +echo "  --disable-rdma           disable RDMA-based migration support"
 +echo "  --enable-rdma            enable RDMA-based migration support"
  echo "  --enable-tcg-interpreter enable TCG with bytecode interpreter (TCI)"
- echo "  --disable-nptl           disable usermode NPTL support"
- echo "  --enable-nptl            enable usermode NPTL support"
  echo "  --enable-system          enable all system emulation targets"
  echo "  --disable-system         disable all system emulation targets"
  echo "  --enable-user            enable supported user emulation targets"

diff --cc exec.c
Simple merge

diff --cc include/exec/cpu-all.h
Simple merge

diff --cc include/exec/gdbstub.h
Simple merge

diff --cc linux-user/main.c
index f6a3aad9e5a6ff0d00f417ac9eac57e18340a520,441e31dc011a84b5ac0d28feafef5d9cb6843142..5dc09471e4fe2b6669826cc6a08ba52ae7f09fc2
--- 1/linux-user/main.c
--- 2/linux-user/main.c
+++ b/linux-user/main.c
@@@ -3639,12 -3634,9 +3636,10 @@@ int main(int argc, char **argv, char **
          fprintf(stderr, "Unable to find CPU definition\n");
          exit(1);
      }
- #if defined(TARGET_SPARC) || defined(TARGET_PPC)
-     cpu_reset(cpu);
- #endif
 +    cpu = ENV_GET_CPU(env);
+     cpu_reset(ENV_GET_CPU(env));
  
 -    thread_cpu = ENV_GET_CPU(env);
 +    thread_cpu = cpu;
  
      if (getenv("QEMU_STRACE")) {
          do_strace = 1;