From patchwork Tue Mar 25 21:47:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Hogan X-Patchwork-Id: 333728 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id D72A9140085 for ; Wed, 26 Mar 2014 08:50:11 +1100 (EST) Received: from localhost ([::1]:44379 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSZEX-0000Jd-MH for incoming@patchwork.ozlabs.org; Tue, 25 Mar 2014 17:50:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34488) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSZEA-0007zY-F1 for qemu-devel@nongnu.org; Tue, 25 Mar 2014 17:49:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WSZE5-0000U5-Jc for qemu-devel@nongnu.org; Tue, 25 Mar 2014 17:49:46 -0400 Received: from mail-we0-f178.google.com ([74.125.82.178]:56751) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSZE5-0000Tw-E7 for qemu-devel@nongnu.org; Tue, 25 Mar 2014 17:49:41 -0400 Received: by mail-we0-f178.google.com with SMTP id u56so756546wes.37 for ; Tue, 25 Mar 2014 14:49:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=AQGxPHUwod+blvL1mXYsJzmr1gR0q6iS6KLIMW2WfD0=; b=ZURaOHhOs1uu8nP+6nSAUqggkVto1Wvt1puXu1kwZVQCvwA7VRDEE7aSDzV3sv9B46 FcVfIISvXjpoNGVbHJz56CxbAnUWR4OneChFrW+JVM9KAC0purEp7LHG21FLuVLHXvC2 noF83sLVxLes93Jj3LXCNT0MH0erc2yLLTZCZlGQjvYGzn2j4ZoVFZDJ5A68ZkIvHCws odT4Yz+e2lW4M2F+k1ywyxmJLjpzVZb8Uwt4VJCJ2RWNtfZXbZNmFu9O8nvdedxm8UP/ uONiKgLrQnVYHRZXUID6HqKQ6aEkFHZz7XIy8puMJ3g6ACjeHHm/mpN4+9wZmFKWjo9M SE+Q== X-Gm-Message-State: ALoCoQkBTyq444ssBU4QHLy59dwPvcuDGyy2DEbnPyf0NIVLEMexnVEc/r94M837kw3rTZ+R+HSi X-Received: by 10.180.210.171 with SMTP id mv11mr24704276wic.44.1395784179937; Tue, 25 Mar 2014 14:49:39 -0700 (PDT) Received: from localhost.localdomain (jahogan.plus.com. [212.159.75.221]) by mx.google.com with ESMTPSA id v6sm54124693wif.0.2014.03.25.14.49.38 for (version=TLSv1.2 cipher=AES128-GCM-SHA256 bits=128/128); Tue, 25 Mar 2014 14:49:39 -0700 (PDT) From: James Hogan To: qemu-devel@nongnu.org Date: Tue, 25 Mar 2014 21:47:28 +0000 Message-Id: <1395784048-28123-1-git-send-email-james.hogan@imgtec.com> X-Mailer: git-send-email 1.8.3.2 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 74.125.82.178 Cc: Riku Voipio , James Hogan , Paul Brook Subject: [Qemu-devel] [PATCH] 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- 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) {