From patchwork Wed Mar 26 13:08:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 27116 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f197.google.com (mail-vc0-f197.google.com [209.85.220.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 41C0120369 for ; Wed, 26 Mar 2014 13:09:18 +0000 (UTC) Received: by mail-vc0-f197.google.com with SMTP id if11sf4479894vcb.4 for ; Wed, 26 Mar 2014 06:09:18 -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:date :message-id:cc:subject:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:errors-to:sender :x-original-sender:x-original-authentication-results:mailing-list; bh=3/Oquc1DfGW7aA0DLq+iPBNXK0grE22MYLzL6FSRn2g=; b=kBFd0piIbYPSrcBgK3mDB/PDLYVUcyCAS7NmiXr1uqeohkwAlQVIMZBwAgKwsoblh8 MATCKdXSSDZOwLrYVKjb8+s91UE/jWGx8z00NYmU4+fm8JtkIxRzbD4HNeHuPVrTaxTp Bot+ns6mbgsGq9b78NVmW7wuCVYKP7fR96wEbAICmN5JFWcUK/DDgBeoaBBqr9pJbsbZ TyPl3CMyy2+QKUzkyUzXHa7UyNsVv8TEmKyMBy+/KBdMwEHW8t3Q3OCJK1sHYs94cdI0 E4gW66UH2DcMzOb6AOWjY+MRX6hIcn3UaOK2QwhDbzVn5K40xPFA35duG0fcrPBi6Ew+ NnHg== X-Gm-Message-State: ALoCoQmU69Rhz3fuNI43JUBWNXSjKWK0/cZrJ0Ejj9aCS7Mgsd88rq+XuL8dz0pJNCYpehsY7yhq X-Received: by 10.236.27.33 with SMTP id d21mr19560406yha.23.1395839357994; Wed, 26 Mar 2014 06:09:17 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.95.203 with SMTP id i69ls194302qge.82.gmail; Wed, 26 Mar 2014 06:09:17 -0700 (PDT) X-Received: by 10.220.131.210 with SMTP id y18mr61266575vcs.12.1395839357878; Wed, 26 Mar 2014 06:09:17 -0700 (PDT) Received: from mail-vc0-f176.google.com (mail-vc0-f176.google.com [209.85.220.176]) by mx.google.com with ESMTPS id z6si1701442vcm.117.2014.03.26.06.09.17 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 26 Mar 2014 06:09:17 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.176 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.176; Received: by mail-vc0-f176.google.com with SMTP id lc6so2270674vcb.7 for ; Wed, 26 Mar 2014 06:09:17 -0700 (PDT) X-Received: by 10.52.65.132 with SMTP id x4mr429503vds.36.1395839357750; Wed, 26 Mar 2014 06:09:17 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.78.9 with SMTP id i9csp44844vck; Wed, 26 Mar 2014 06:09:17 -0700 (PDT) X-Received: by 10.140.87.151 with SMTP id r23mr79634339qgd.23.1395839357245; Wed, 26 Mar 2014 06:09:17 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id t9si1596357qct.35.2014.03.26.06.09.17 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 26 Mar 2014 06:09:17 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:47898 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSna0-0007e1-Jv for patch@linaro.org; Wed, 26 Mar 2014 09:09:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36629) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSnZK-0006vb-JQ for qemu-devel@nongnu.org; Wed, 26 Mar 2014 09:08:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WSnZG-0008DU-3q for qemu-devel@nongnu.org; Wed, 26 Mar 2014 09:08:34 -0400 Received: from afflict.kos.to ([92.243.29.197]:57747) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSnZF-0008Cw-SU for qemu-devel@nongnu.org; Wed, 26 Mar 2014 09:08:30 -0400 Received: from localhost.localdomain (afflict [92.243.29.197]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by afflict.kos.to (Postfix) with ESMTPSA id 99D1E26563; Wed, 26 Mar 2014 14:08:27 +0100 (CET) From: riku.voipio@linaro.org To: qemu-devel@nongnu.org Date: Wed, 26 Mar 2014 15:08:26 +0200 Message-Id: <1395839306-15697-2-git-send-email-riku.voipio@linaro.org> X-Mailer: git-send-email 1.7.2.5 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 92.243.29.197 Cc: peter.maydell@linaro.org, Riku Voipio , James Hogan , Paul Brook Subject: [Qemu-devel] [PULL for-2.0] linux-user: Correct DLINFO_ITEMS X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: riku.voipio@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.176 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 Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: James Hogan Commit a07c67dfccb1 (Implement AT_CLKTCK.) back in March 2008 added a new auxvec entry but didn't increment DLINFO_ITEMS, so it's been out of sync ever since. Bump it up to 14 so that it matches the number of NEW_AUX_ENT's that need to be counted in create_elf_tables(). Signed-off-by: James Hogan Cc: Riku Voipio Cc: Paul Brook Reviewed-by: Peter Maydell Signed-off-by: Riku Voipio --- linux-user/elfload.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 99a2c58..d2380b6 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -1076,7 +1076,7 @@ struct exec #define TARGET_ELF_PAGESTART(_v) ((_v) & ~(unsigned long)(TARGET_ELF_EXEC_PAGESIZE-1)) #define TARGET_ELF_PAGEOFFSET(_v) ((_v) & (TARGET_ELF_EXEC_PAGESIZE-1)) -#define DLINFO_ITEMS 13 +#define DLINFO_ITEMS 14 static inline void memcpy_fromfs(void * to, const void * from, unsigned long n) {