From: Keir Fraser <keir.fraser@citrix.com>
Date: Tue, 4 Dec 2007 10:10:23 +0000 (+0000)
Subject: vnet: Fix compilation on x86/64 which erroneously asserts
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14683^2~11
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=385f8d1811f3a9af33fc8102d59978e27001618a;p=xen.git

vnet: Fix compilation on x86/64 which erroneously asserts
__ARCH_WANT_SYS_SOCKETCALL.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
---

diff --git a/tools/vnet/vnet-module/varp_socket.c b/tools/vnet/vnet-module/varp_socket.c
index 7b2ef9f938..9e49f3498f 100644
--- a/tools/vnet/vnet-module/varp_socket.c
+++ b/tools/vnet/vnet-module/varp_socket.c
@@ -77,9 +77,10 @@ static inline _syscall3(int, fcntl,
  * Some architectures use socketcall() to multiplex the socket-related calls,
  * but others define individual syscalls instead.
  * Architectures using socketcall() define __ARCH_WANT_SYS_SOCKETCALL.
+ * NB. x86_64 architecture asserts __ARCH_WANT_SYS_SOCKETCALL in error.
  */
 
-#ifdef __ARCH_WANT_SYS_SOCKETCALL
+#if defined(__ARCH_WANT_SYS_SOCKETCALL) && !defined(__x86_64__)
 
 /* Define the socketcall() syscall.
  * Multiplexes all the socket-related calls.