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_c17
1 files changed, 14 insertions, 3 deletions
diff --git a/package/qemu/patches/patch-linux-user_syscall_c b/package/qemu/patches/patch-linux-user_syscall_c
index 21c9afef5..1eba70417 100644
--- a/package/qemu/patches/patch-linux-user_syscall_c
+++ b/package/qemu/patches/patch-linux-user_syscall_c
@@ -1,11 +1,22 @@
--- 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-30 12:14:53.751964593 +0100
-@@ -94,7 +94,7 @@ int __clone2(int (*fn)(void *), void *ch
++++ 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
+ #include <netinet/ip.h>
+ #include <netinet/tcp.h>
+ #include <linux/wireless.h>
++#include <linux/version.h>
+ #include <linux/icmp.h>
+ #include "qemu-common.h"
+ #ifdef TARGET_GPROF
+@@ -94,7 +95,11 @@ int __clone2(int (*fn)(void *), void *ch
#include <linux/utsname.h>
#include <linux/cdrom.h>
#include <linux/hdreg.h>
--#include <linux/soundcard.h>
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(3,11,0)
+ #include <linux/soundcard.h>
++#else
+#include <linux/soundcard.h.oss3>
++#endif
#include <linux/kd.h>
#include <linux/mtio.h>
#include <linux/fs.h>