diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2013-05-22 08:22:36 -0500 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-05-22 08:22:36 -0500 |
commit | 95de21a430f7bc4166a153b1f69b1425c8a99c7b (patch) | |
tree | ed0754df09c7e0bd9bafce52cffdd8257a687897 /tests/tcg | |
parent | 3459f01b2d9612070ec23221a4ccb60a41b775ae (diff) | |
parent | d2ad50210b35c2685640f7df931a0fccb49334f7 (diff) |
Merge remote-tracking branch 'mjt/trivial-patches' into staging
# By Christophe Lyon (1) and others
# Via Michael Tokarev
* mjt/trivial-patches:
target-moxie: replace target_phys_addr_t with hwaddr
Rename hexdump to avoid FreeBSD libutil conflict
remove some double-includes
translate: remove redundantly included qemu/timer.h
Remove twice include of qemu-common.h
fix /proc/self/maps output
Message-id: 51977B44.1000302@msgid.tls.msk.ru
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'tests/tcg')
-rw-r--r-- | tests/tcg/linux-test.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/tcg/linux-test.c b/tests/tcg/linux-test.c index 83cb32ddb9..1c6c01318e 100644 --- a/tests/tcg/linux-test.c +++ b/tests/tcg/linux-test.c @@ -39,7 +39,6 @@ #include <dirent.h> #include <setjmp.h> #include <sys/shm.h> -#include <sched.h> #define TESTPATH "/tmp/linux-test.tmp" #define TESTPORT 7654 |