[xen-unstable] vnet: Fix compilation on x86/64 which erroneously asserts

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[xen-unstable] vnet: Fix compilation on x86/64 which erroneously asserts

Xen patchbot-unstable
# HG changeset patch
# User Keir Fraser <[hidden email]>
# Date 1196763023 0
# Node ID 7573133112c54b2b21043eb605786789cec40f07
# Parent  f54b2dd57037df7cb610b05c754b9479ab5d7108
vnet: Fix compilation on x86/64 which erroneously asserts
__ARCH_WANT_SYS_SOCKETCALL.
Signed-off-by: Keir Fraser <[hidden email]>
---
 tools/vnet/vnet-module/varp_socket.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff -r f54b2dd57037 -r 7573133112c5 tools/vnet/vnet-module/varp_socket.c
--- a/tools/vnet/vnet-module/varp_socket.c Tue Dec 04 10:04:00 2007 +0000
+++ b/tools/vnet/vnet-module/varp_socket.c Tue Dec 04 10:10:23 2007 +0000
@@ -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.
- */
-
-#ifdef __ARCH_WANT_SYS_SOCKETCALL
+ * NB. x86_64 architecture asserts __ARCH_WANT_SYS_SOCKETCALL in error.
+ */
+
+#if defined(__ARCH_WANT_SYS_SOCKETCALL) && !defined(__x86_64__)
 
 /* Define the socketcall() syscall.
  * Multiplexes all the socket-related calls.

_______________________________________________
Xen-changelog mailing list
[hidden email]
http://lists.xensource.com/xen-changelog