From patchwork Sun Jun 29 12:14:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 32671 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f198.google.com (mail-pd0-f198.google.com [209.85.192.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id EBA1023577 for ; Sun, 29 Jun 2014 12:19:46 +0000 (UTC) Received: by mail-pd0-f198.google.com with SMTP id y10sf31491209pdj.9 for ; Sun, 29 Jun 2014 05:19:46 -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=vE2Ut7F8jkrxsuuLsL2f/5inxnotm+QVpQo3JwE+6c4=; b=aPZZPpb7YdU4GCjI37lQ7W0OqhHsA25e4rhEzQKXdy1YrVJvhHuEtnlKE2uX+SezRv /UHYy1J+aUzLhgdRQwNAmKaJTltcAHe+4R6l7AVvKFrt+NGe6446bwNOmWERKkoSO7S2 52mcCqyiiFOZ/hYQNcrGhR+5tndUpoIEZVJTd166Ky7a3y6SxwIGUM0dEs5RlYRvHN9g Nv/GutFNsjxt4JqSMilv4NXwmyOg+tsNQnTZr0vFg7iNPE0KWvt62TuMuB25IEXEd8FD 7nNx86hEy2OtrNKoZuzkuBiGKgTX9/Vl0zYO5KpZPbIIIKjnsVQOo9x1Pys3di1DzSYt dEJA== X-Gm-Message-State: ALoCoQkcgtEL6lUE22ODokVo/mJzdplsaBxEsbi1RFHRCM6tO9u1GhSAaHLJAiIdTfsGgH1M5K6q X-Received: by 10.66.65.142 with SMTP id x14mr19232974pas.14.1404044386178; Sun, 29 Jun 2014 05:19:46 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.28.4 with SMTP id 4ls567482qgy.98.gmail; Sun, 29 Jun 2014 05:19:46 -0700 (PDT) X-Received: by 10.220.166.9 with SMTP id k9mr32187005vcy.20.1404044386017; Sun, 29 Jun 2014 05:19:46 -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 qe9si8821449vcb.79.2014.06.29.05.19.45 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 29 Jun 2014 05:19:45 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.176 as permitted sender) client-ip=209.85.220.176; Received: by mail-vc0-f176.google.com with SMTP id ik5so6501205vcb.35 for ; Sun, 29 Jun 2014 05:19:45 -0700 (PDT) X-Received: by 10.220.250.203 with SMTP id mp11mr31987623vcb.2.1404044385933; Sun, 29 Jun 2014 05:19:45 -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 tc5csp72497vcb; Sun, 29 Jun 2014 05:19:45 -0700 (PDT) X-Received: by 10.140.51.175 with SMTP id u44mr47886885qga.69.1404044385472; Sun, 29 Jun 2014 05:19:45 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id f16si20998940qaq.15.2014.06.29.05.19.45 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Sun, 29 Jun 2014 05:19:45 -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]:57534 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X1E5B-0003k3-1S for patch@linaro.org; Sun, 29 Jun 2014 08:19:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47646) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X1E0g-0004AS-W4 for qemu-devel@nongnu.org; Sun, 29 Jun 2014 08:15:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X1E0X-0000c1-P8 for qemu-devel@nongnu.org; Sun, 29 Jun 2014 08:15:06 -0400 Received: from [2001:4b98:dc0:45:216:3eff:fe3d:166f] (port=41890 helo=afflict.kos.to) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X1E0X-0000bI-HM for qemu-devel@nongnu.org; Sun, 29 Jun 2014 08:14:57 -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 3BDA726587; Sun, 29 Jun 2014 14:14:56 +0200 (CEST) From: riku.voipio@linaro.org To: qemu-devel@nongnu.org Date: Sun, 29 Jun 2014 15:14:49 +0300 Message-Id: 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: Peter Maydell , Anthony Liguori , Paul Burton Subject: [Qemu-devel] [PULL v2 09/13] 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.220.176 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;