summaryrefslogtreecommitdiff
path: root/package/qemu/patches/patch-linux-user_syscall_c
diff options
context:
space:
mode:
Diffstat (limited to 'package/qemu/patches/patch-linux-user_syscall_c')
-rw-r--r--package/qemu/patches/patch-linux-user_syscall_c25
1 files changed, 19 insertions, 6 deletions
diff --git a/package/qemu/patches/patch-linux-user_syscall_c b/package/qemu/patches/patch-linux-user_syscall_c
index 1eba70417..11188ca90 100644
--- a/package/qemu/patches/patch-linux-user_syscall_c
+++ b/package/qemu/patches/patch-linux-user_syscall_c
@@ -1,22 +1,35 @@
---- qemu-1.7.0.orig/linux-user/syscall.c 2013-11-27 23:15:55.000000000 +0100
-+++ qemu-1.7.0/linux-user/syscall.c 2014-01-31 09:51:34.051058876 +0100
-@@ -64,6 +64,7 @@ int __clone2(int (*fn)(void *), void *ch
+--- qemu-1.7.1.orig/linux-user/syscall.c 2014-03-25 15:01:10.000000000 +0100
++++ qemu-1.7.1/linux-user/syscall.c 2014-04-04 16:51:08.292546548 +0200
+@@ -63,6 +63,7 @@ int __clone2(int (*fn)(void *), void *ch
+ //#include <sys/user.h>
#include <netinet/ip.h>
#include <netinet/tcp.h>
- #include <linux/wireless.h>
+#include <linux/version.h>
+ #include <linux/wireless.h>
#include <linux/icmp.h>
#include "qemu-common.h"
- #ifdef TARGET_GPROF
-@@ -94,7 +95,11 @@ int __clone2(int (*fn)(void *), void *ch
+@@ -94,7 +95,15 @@ int __clone2(int (*fn)(void *), void *ch
#include <linux/utsname.h>
#include <linux/cdrom.h>
#include <linux/hdreg.h>
++#ifdef NATIVE
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(3,11,0)
#include <linux/soundcard.h>
+#else
+#include <linux/soundcard.h.oss3>
+#endif
++#else
++#include <linux/soundcard.h>
++#endif
#include <linux/kd.h>
#include <linux/mtio.h>
#include <linux/fs.h>
+@@ -400,7 +409,7 @@ static int sys_inotify_init1(int flags)
+ #endif
+ #define __NR_sys_ppoll __NR_ppoll
+ _syscall5(int, sys_ppoll, struct pollfd *, fds, nfds_t, nfds,
+- struct timespec *, timeout, const __sigset_t *, sigmask,
++ struct timespec *, timeout, const sigset_t *, sigmask,
+ size_t, sigsetsize)
+ #endif
+