From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-x22f.google.com (mail-wr0-x22f.google.com [IPv6:2a00:1450:400c:c0c::22f]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 15F412194EB57 for ; Thu, 13 Apr 2017 02:59:40 -0700 (PDT) Received: by mail-wr0-x22f.google.com with SMTP id l28so32441860wre.0 for ; Thu, 13 Apr 2017 02:59:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=okcE6Vjn2RZwNOK+9kkny+4DqukszMzrACvi53raiNU=; b=ErzOiCgCm4gOBpsXua64SC1rFY+l0zuHZumWZpOjsZSLSXV66X1XBJbcdIXio5oIaP 1jf6OIPXtHdJYut2Puv3ZXze5YoKAxVZm1sjE/YoBw9RFYfoXyKuUKgqd52KoasbZGDY zjnt2ef0G0e0K2vbWfuTmeZPEyDxZgy54aWTE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=okcE6Vjn2RZwNOK+9kkny+4DqukszMzrACvi53raiNU=; b=i9+0YzXt20ZAkVnjLhUGMZEEhOsYqwQQW+sJY1MqOU6DLSYijrBNiaum5p7raPt+lT j7IOBUWpy3csmxx8BdBqFv7Wiy5EcSt4nBrKElFWBsuvrUk1WMqqA9UoGToTY38GSQ0R QBk/bacRtQ5jXad5Qx5DwZao/H3sDd4rHIAHaMwuYD/rxp7gSX8xziAEsLPWqaRf9Ni7 rByswsSzjkREXkKHNWqzc2LgNKRbnod87GIj5gdd/t/6ZXZjWmmddnyAHqhyp2tyuJiS 78gZ2mf98XP+GoqV1dSaS1drYQY/RJS74JFfZbh3sJK6stVO2nrBv+7YwuzbxBqzrnpZ FPHQ== X-Gm-Message-State: AN3rC/5TFux3Lcbcs/qfGpR1L4iuhrqH4lOzdFVjUAn+BCUruoMpz/Mu 2OYGzRZS2W3IPec1 X-Received: by 10.223.174.241 with SMTP id y104mr2367152wrc.79.1492077578335; Thu, 13 Apr 2017 02:59:38 -0700 (PDT) Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by smtp.gmail.com with ESMTPSA id o71sm13672578wrb.47.2017.04.13.02.59.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Apr 2017 02:59:37 -0700 (PDT) Date: Thu, 13 Apr 2017 10:59:35 +0100 From: Leif Lindholm To: Ard Biesheuvel Cc: "edk2-devel@lists.01.org" Message-ID: <20170413095935.GE1657@bivouac.eciton.net> References: <20170412202229.28396-1-leif.lindholm@linaro.org> MIME-Version: 1.0 In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) Subject: Re: [PATCH] ArmPkg: copy/paste fixes in ARM ArmHvcLib/ArmSmcLib X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Apr 2017 09:59:40 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Thu, Apr 13, 2017 at 08:32:32AM +0100, Ard Biesheuvel wrote: > On 12 April 2017 at 21:22, Leif Lindholm wrote: > > ARM ArmHvcLib looks like it was created from copy of ArmSmcLib which > > looks like it was created from a copy of the AArch64 version. > > > > Both of these files include AsmMacroIoLibV8.h instead of > > AsmMacroIoLib.h, although since they only use macros that are identical > > between the two, there was no functional issue caused by this. > > > > Contributed-under: TianoCore Contribution Agreement 1.0 > > Signed-off-by: Leif Lindholm > > Reviewed-by: Ard Biesheuvel Thanks! Pushed as d63ed30. > > --- > > ArmPkg/Library/ArmHvcLib/Arm/ArmHvc.S | 2 +- > > ArmPkg/Library/ArmSmcLib/Arm/ArmSmc.S | 2 +- > > 2 files changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/ArmPkg/Library/ArmHvcLib/Arm/ArmHvc.S b/ArmPkg/Library/ArmHvcLib/Arm/ArmHvc.S > > index be4693796f..fef51e7521 100644 > > --- a/ArmPkg/Library/ArmHvcLib/Arm/ArmHvc.S > > +++ b/ArmPkg/Library/ArmHvcLib/Arm/ArmHvc.S > > @@ -12,7 +12,7 @@ > > // > > // > > > > -#include > > +#include > > > > .arch_extension virt > > > > diff --git a/ArmPkg/Library/ArmSmcLib/Arm/ArmSmc.S b/ArmPkg/Library/ArmSmcLib/Arm/ArmSmc.S > > index afb2e9bc90..990e12ef75 100644 > > --- a/ArmPkg/Library/ArmSmcLib/Arm/ArmSmc.S > > +++ b/ArmPkg/Library/ArmSmcLib/Arm/ArmSmc.S > > @@ -11,7 +11,7 @@ > > // > > // > > > > -#include > > +#include > > > > .arch_extension sec > > > > -- > > 2.11.0 > >