From patchwork Tue Mar 18 15:53:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 26498 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pb0-f71.google.com (mail-pb0-f71.google.com [209.85.160.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6F9ED203C3 for ; Tue, 18 Mar 2014 15:55:58 +0000 (UTC) Received: by mail-pb0-f71.google.com with SMTP id up15sf18415955pbc.6 for ; Tue, 18 Mar 2014 08:55:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id :mime-version:cc:subject:precedence:list-id:list-unsubscribe :list-post:list-help:list-subscribe:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list :list-archive:content-type:content-transfer-encoding; bh=Vnh4wDS/GixLoMb4fFcl7GUR9oDFwLrLxbSP4vggvIM=; b=VTUTJBypoySsZX+L+HSlHxORxFlcWWh2Q7ClUoCBsTqpN/HAPsD4Ewqe9tDJYZEghQ ZpRCkLipRkoCTZdPb2EupugcbyaycJ9MVYrqA7zWkAN7WR1DUGH19mx+ysNl80NWWodn Thvy2tWn7gTEjoeLISi5rHNfC11L4HZ3DzCYLZZ1LCI0oM2F9zcFu46YOKCoTNAcAC8l 1Vep3Myf727whwe+PBEELUoWUcUtA+9GmTTotEXQ17IQFD5/VRpKxeAGnPVbudtWRC7d 1953tZOPuaOL8SpotQ27dH5+wJxa4YH6gv92MWE1O6FoFT+oVwPg50058sWMkqelCsUd Ph9w== X-Gm-Message-State: ALoCoQkdKUefNdlkZ/yW4F8lhnF0yx4MUcvZ7IbF8+2fhLD2ClMetvJ4ntb5j9AwcnPyVvlT2KKj X-Received: by 10.66.240.4 with SMTP id vw4mr11653609pac.10.1395158157647; Tue, 18 Mar 2014 08:55:57 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.22.167 with SMTP id 36ls220389qgn.55.gmail; Tue, 18 Mar 2014 08:55:57 -0700 (PDT) X-Received: by 10.220.104.210 with SMTP id q18mr16124690vco.9.1395158157457; Tue, 18 Mar 2014 08:55:57 -0700 (PDT) Received: from mail-ve0-f179.google.com (mail-ve0-f179.google.com [209.85.128.179]) by mx.google.com with ESMTPS id gs7si2726405vdc.164.2014.03.18.08.55.57 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 18 Mar 2014 08:55:57 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.179 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.179; Received: by mail-ve0-f179.google.com with SMTP id db12so7172154veb.24 for ; Tue, 18 Mar 2014 08:55:57 -0700 (PDT) X-Received: by 10.221.39.138 with SMTP id tm10mr25682948vcb.7.1395158157366; Tue, 18 Mar 2014 08:55:57 -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 i9csp218161vck; Tue, 18 Mar 2014 08:55:56 -0700 (PDT) X-Received: by 10.224.56.5 with SMTP id w5mr36415253qag.60.1395158156663; Tue, 18 Mar 2014 08:55:56 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id j61si4720317qga.137.2014.03.18.08.55.56 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 18 Mar 2014 08:55:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xen.org designates 50.57.142.19 as permitted sender) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPwKV-00077W-0U; Tue, 18 Mar 2014 15:53:27 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPwKT-00077M-Nh for xen-devel@lists.xen.org; Tue, 18 Mar 2014 15:53:26 +0000 Received: from [85.158.137.68:15615] by server-11.bemta-3.messagelabs.com id 26/6D-19438-4FB68235; Tue, 18 Mar 2014 15:53:24 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1395158002!1400629!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7408 invoked from network); 18 Mar 2014 15:53:24 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-15.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 18 Mar 2014 15:53:24 -0000 X-IronPort-AV: E=Sophos;i="4.97,678,1389744000"; d="scan'208";a="111143940" Received: from accessns.citrite.net (HELO FTLPEX01CL03.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 18 Mar 2014 15:53:22 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.13.107.80) with Microsoft SMTP Server id 14.2.342.4; Tue, 18 Mar 2014 11:53:21 -0400 Received: from drall.uk.xensource.com ([10.80.16.71] helo=drall.uk.xensource.com.) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1WPwKP-0000M4-NB; Tue, 18 Mar 2014 15:53:21 +0000 From: Ian Campbell To: Date: Tue, 18 Mar 2014 15:53:21 +0000 Message-ID: <1395158001-28085-2-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 X-DLP: MIA1 Cc: julien.grall@linaro.org, tim@xen.org, Ian Campbell , stefano.stabellini@eu.citrix.com Subject: [Xen-devel] [PATCH v2 2/2] xen: arm: fixup a couple of coding style issues X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ian.campbell@citrix.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.179 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 List-Archive: The if in domain.c was only syntactically valid because the macro happened to contain enclosing braces. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/domain.c | 2 +- xen/arch/arm/traps.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 0f83e81..8f91c2e 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -257,7 +257,7 @@ static void continue_new_vcpu(struct vcpu *prev) if ( is_idle_vcpu(current) ) reset_stack_and_jump(idle_loop); - else if is_32bit_domain(current->domain) + else if ( is_32bit_domain(current->domain) ) /* check_wakeup_from_wait(); */ reset_stack_and_jump(return_to_new_vcpu32); else diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 563cc62..5d66bc4 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1563,12 +1563,12 @@ asmlinkage void do_trap_hypervisor(struct cpu_user_regs *regs) advance_pc(regs, hsr); break; case HSR_EC_CP15_32: - if ( ! is_32bit_domain(current->domain) ) + if ( !is_32bit_domain(current->domain) ) goto bad_trap; do_cp15_32(regs, hsr); break; case HSR_EC_CP15_64: - if ( ! is_32bit_domain(current->domain) ) + if ( !is_32bit_domain(current->domain) ) goto bad_trap; do_cp15_64(regs, hsr); break;