patch-linux-user_syscall_c 1.1 KB

1234567891011121314151617181920212223242526272829303132333435
  1. --- qemu-1.7.1.orig/linux-user/syscall.c 2014-03-25 15:01:10.000000000 +0100
  2. +++ qemu-1.7.1/linux-user/syscall.c 2014-04-04 16:51:08.292546548 +0200
  3. @@ -63,6 +63,7 @@ int __clone2(int (*fn)(void *), void *ch
  4. //#include <sys/user.h>
  5. #include <netinet/ip.h>
  6. #include <netinet/tcp.h>
  7. +#include <linux/version.h>
  8. #include <linux/wireless.h>
  9. #include <linux/icmp.h>
  10. #include "qemu-common.h"
  11. @@ -94,7 +95,15 @@ int __clone2(int (*fn)(void *), void *ch
  12. #include <linux/utsname.h>
  13. #include <linux/cdrom.h>
  14. #include <linux/hdreg.h>
  15. +#ifdef NATIVE
  16. +#if LINUX_VERSION_CODE <= KERNEL_VERSION(3,11,0)
  17. #include <linux/soundcard.h>
  18. +#else
  19. +#include <linux/soundcard.h.oss3>
  20. +#endif
  21. +#else
  22. +#include <linux/soundcard.h>
  23. +#endif
  24. #include <linux/kd.h>
  25. #include <linux/mtio.h>
  26. #include <linux/fs.h>
  27. @@ -400,7 +409,7 @@ static int sys_inotify_init1(int flags)
  28. #endif
  29. #define __NR_sys_ppoll __NR_ppoll
  30. _syscall5(int, sys_ppoll, struct pollfd *, fds, nfds_t, nfds,
  31. - struct timespec *, timeout, const __sigset_t *, sigmask,
  32. + struct timespec *, timeout, const sigset_t *, sigmask,
  33. size_t, sigsetsize)
  34. #endif