From patchwork Wed Mar 19 16:15:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 26592 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f198.google.com (mail-ve0-f198.google.com [209.85.128.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0425D203C3 for ; Wed, 19 Mar 2014 16:15:11 +0000 (UTC) Received: by mail-ve0-f198.google.com with SMTP id oz11sf21964783veb.5 for ; Wed, 19 Mar 2014 09:15:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=mMU5K3+0DjWLrX+3hXyHGA6kJYGjqtIEVbVNFJi8Xog=; b=G4NyVhfMHDsJzP3OEWk1qZi+ASP2R786ZEei9wtHuXv5OdaIakqFBgMB3qaz/vmLeV kr+fzleLlFa4b8fmGvRaJbjRV23Na63lw8nQ7adocytg83bnJ/kT1JU2NrDhosykIPe9 OKFlu9Bpm16Yh4DPefMWyCQcd18hwb7Yk+595TLFYlCd4Rivf3jgcph4wY2nKEDXcjPS ivS3fmlI782R8O50BrY/w/8xCUEqYjrJX+2mhdmF1BwbjRWo5adcIVHNTK/MvDLu0ndY eGUxP/GXe+f20Yb4b9L9F22ko70aimfa/1j7/WQpHNIN1+xCrdW3/OxZE2zm2eWBt9fS cS7A== X-Gm-Message-State: ALoCoQkkBQ8fu5Pfql+S8bOYe3SOkPPj7TDNQZ+E552dgPt3pPfopHe4Dgc3KmVHXC6hdmIRKynq X-Received: by 10.58.57.4 with SMTP id e4mr5078642veq.24.1395245711722; Wed, 19 Mar 2014 09:15:11 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.16.165 with SMTP id 34ls2488586qgb.30.gmail; Wed, 19 Mar 2014 09:15:11 -0700 (PDT) X-Received: by 10.58.38.166 with SMTP id h6mr10170789vek.22.1395245711579; Wed, 19 Mar 2014 09:15:11 -0700 (PDT) Received: from mail-vc0-f175.google.com (mail-vc0-f175.google.com [209.85.220.175]) by mx.google.com with ESMTPS id h13si7864167vct.68.2014.03.19.09.15.11 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 19 Mar 2014 09:15:11 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.175; Received: by mail-vc0-f175.google.com with SMTP id lh14so9344145vcb.20 for ; Wed, 19 Mar 2014 09:15:11 -0700 (PDT) X-Received: by 10.58.190.99 with SMTP id gp3mr1041125vec.32.1395245711494; Wed, 19 Mar 2014 09:15:11 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.78.9 with SMTP id i9csp313644vck; Wed, 19 Mar 2014 09:15:11 -0700 (PDT) X-Received: by 10.194.188.41 with SMTP id fx9mr3188597wjc.56.1395245710500; Wed, 19 Mar 2014 09:15:10 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id gb10si10619966wib.45.2014.03.19.09.15.10 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 19 Mar 2014 09:15:10 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::1 as permitted sender) client-ip=2001:8b0:1d0::1; Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1WQJ92-0005yy-9c; Wed, 19 Mar 2014 16:15:08 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Laurent Desnogues , Riku Voipio Subject: [PATCH buildfix for-2.0] linux-user: Fix build if headers don't define _LINUX_CAPABILITY_VERSION_1 Date: Wed, 19 Mar 2014 16:15:08 +0000 Message-Id: <1395245708-22971-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 Reported-by: Laurent Desnogues Reviewed-by: Laurent Desnogues --- linux-user/syscall.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 366b695..2eac6d5 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; }