From: Peter Maydell <peter.maydell@linaro.org>
Date: Wed, 19 Mar 2014 16:07:30 +0000 (+0000)
Subject: linux-user: Fix build if headers don't define _LINUX_CAPABILITY_VERSION_1
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ec864874bd1c1e13c82f4096fd3957d26c70a680;p=qemu.git

linux-user: Fix build if headers don't define _LINUX_CAPABILITY_VERSION_1

Older kernel headers don't define _LINUX_CAPABILITY_VERSION_1.
Switch to using the older _LINUX_CAPABILITY_VERSION; newer headers
still define this for source compatibility.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reported-by: Laurent Desnogues <laurent.desnogues@gmail.com>
Reviewed-by: Laurent Desnogues <laurent.desnogues@gmail.com>
Acked-by: Riku Voipio <riku.voipio@iki.fi>
---

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 366b6951e9..2eac6d5aa9 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -7698,7 +7698,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
         header.version = tswap32(target_header->version);
         header.pid = tswap32(target_header->pid);
 
-        if (header.version != _LINUX_CAPABILITY_VERSION_1) {
+        if (header.version != _LINUX_CAPABILITY_VERSION) {
             /* Version 2 and up takes pointer to two user_data structs */
             data_items = 2;
         }