From patchwork Mon Jun 23 13:26:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 32357 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f70.google.com (mail-oa0-f70.google.com [209.85.219.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 82B7520540 for ; Mon, 23 Jun 2014 13:31:30 +0000 (UTC) Received: by mail-oa0-f70.google.com with SMTP id m1sf43082689oag.1 for ; Mon, 23 Jun 2014 06:31:29 -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:in-reply-to:references: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=Da3oQXPKELYcPpWD7BmEtLbgVCS+4qJPC14RG27GqzE=; b=THzWcF7kqhjL5iI65jgp2/qXmf2siP7lOirkMl0zo11Y6ZH1d1IE7HKOv/5dFk3/v8 n7EQKivSj+i6o2poO9/RN6+JJ7PgN5cr0U/MbqPqldlfGjgT3lIWhT3j8LG55NZWoPnu uOHhNOKxdwWJgwKhGWnVzIRm0P5rM3OEBizLT4FFFyzTV9K5PLtUBa3/7zQjNUqqC/6N uUKL0nDQnw3kwZyQxvS1sFFXz9Ry4DNMlfwn9aTCjndOaNb6NKCMCEcDIpUn/3+/Libl amh0Ekd3amnp4uUEjHKzRKtk/wRecwW7qyxg3NcHUcTDzPXQUtXK68mR54NpxPLyzUzR 088A== X-Gm-Message-State: ALoCoQlRx6KIsnYRHICXb5b85hz7+zy8kkdBBCeTj2a2YdQ729nSDAIeeg0bEr+B96VMZXUE9+QR X-Received: by 10.50.44.69 with SMTP id c5mr9719107igm.3.1403530289954; Mon, 23 Jun 2014 06:31:29 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.34.36 with SMTP id k33ls1923601qgk.40.gmail; Mon, 23 Jun 2014 06:31:29 -0700 (PDT) X-Received: by 10.52.99.66 with SMTP id eo2mr392600vdb.82.1403530289868; Mon, 23 Jun 2014 06:31:29 -0700 (PDT) Received: from mail-ve0-f180.google.com (mail-ve0-f180.google.com [209.85.128.180]) by mx.google.com with ESMTPS id lv1si8984255vcb.85.2014.06.23.06.31.29 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 23 Jun 2014 06:31:29 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.180 as permitted sender) client-ip=209.85.128.180; Received: by mail-ve0-f180.google.com with SMTP id jw12so6011341veb.25 for ; Mon, 23 Jun 2014 06:31:29 -0700 (PDT) X-Received: by 10.58.112.65 with SMTP id io1mr482128veb.61.1403530289811; Mon, 23 Jun 2014 06:31:29 -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.221.37.5 with SMTP id tc5csp130891vcb; Mon, 23 Jun 2014 06:31:29 -0700 (PDT) X-Received: by 10.140.32.197 with SMTP id h63mr26655036qgh.10.1403530289413; Mon, 23 Jun 2014 06:31:29 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id s111si22658239qge.72.2014.06.23.06.31.29 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 23 Jun 2014 06:31:29 -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]:53534 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wz4LI-0000ZF-Sf for patch@linaro.org; Mon, 23 Jun 2014 09:31:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55656) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wz4Gm-0003iJ-Gs for qemu-devel@nongnu.org; Mon, 23 Jun 2014 09:26:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wz4Gd-0001BA-Jx for qemu-devel@nongnu.org; Mon, 23 Jun 2014 09:26:48 -0400 Received: from [2001:4b98:dc0:45:216:3eff:fe3d:166f] (port=37366 helo=afflict.kos.to) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wz4Gd-0001AZ-CM for qemu-devel@nongnu.org; Mon, 23 Jun 2014 09:26:39 -0400 Received: from afflict.kos.to (afflict [92.243.29.197]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by afflict.kos.to (Postfix) with ESMTPSA id 6068726589; Mon, 23 Jun 2014 15:26:36 +0200 (CEST) From: riku.voipio@linaro.org To: qemu-devel@nongnu.org Date: Mon, 23 Jun 2014 16:26:25 +0300 Message-Id: <276cda07004a93baa7890b1ca5bd78fda50d31ff.1403529800.git.riku.voipio@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 2001:4b98:dc0:45:216:3eff:fe3d:166f Cc: Paul Burton Subject: [Qemu-devel] [PULL 10/19] linux-user: fix struct target_epoll_event layout for MIPS 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=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.180 as permitted sender) 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: Paul Burton MIPS requires the pad field to 64b-align the data field just as ARM does. Signed-off-by: Paul Burton Signed-off-by: Riku Voipio --- linux-user/syscall_defs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h index 69c3982..e379b45 100644 --- a/linux-user/syscall_defs.h +++ b/linux-user/syscall_defs.h @@ -2528,7 +2528,7 @@ typedef union target_epoll_data { struct target_epoll_event { uint32_t events; -#ifdef TARGET_ARM +#if defined(TARGET_ARM) || defined(TARGET_MIPS) || defined(TARGET_MIPS64) uint32_t __pad; #endif target_epoll_data_t data;