From patchwork Wed Apr 12 20:22:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 97342 Delivered-To: patch@linaro.org Received: by 10.140.109.52 with SMTP id k49csp429867qgf; Wed, 12 Apr 2017 13:22:35 -0700 (PDT) X-Received: by 10.98.68.133 with SMTP id m5mr12317641pfi.60.1492028555824; Wed, 12 Apr 2017 13:22:35 -0700 (PDT) Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id a21si21560356pfh.134.2017.04.12.13.22.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Apr 2017 13:22:35 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 75E1B21939234; Wed, 12 Apr 2017 13:22:35 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-wm0-x22f.google.com (mail-wm0-x22f.google.com [IPv6:2a00:1450:400c:c09::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 A585621A0483A for ; Wed, 12 Apr 2017 13:22:33 -0700 (PDT) Received: by mail-wm0-x22f.google.com with SMTP id w64so96915990wma.0 for ; Wed, 12 Apr 2017 13:22:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=h3y/uLnY14M5rAgUHv7GkNIPuBJqVo4Z5n1pacz0CFE=; b=DwdJKXuu01aMD14Le28aIVqReCqrAHLZORV3a3yw6u5OEqDAz6hmlqLcTYX8/IMotw ZFqii44Bb6WZ3ZUG2qbijUt4uVv1F3vHKo+JvThCq0Q7+2hs36xt34CyfIRH/U4+CueM UR42NBSZSPCMR8X0ZqYIXAm109sCSsXR5nAf0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=h3y/uLnY14M5rAgUHv7GkNIPuBJqVo4Z5n1pacz0CFE=; b=oV0HuRUUajzmCSBI/dN2Y0lRGv0ZdFe5h3lgfgT+eUcDP0FWLgvxGdLc4GSJVN2j8r u7DtGyqFEhisYLFOEYpiREbgxEoLxDNcjuqprwMltTwv+1ez5twrvNTZK9+kPZDppgHl Troet14AwLSrJUm+lt7VD/wOoG2VBfKC3fRD6jtIGFAc6uuNgnoUHv1tjYCdJd+ZrmyR 9t8xpbLyyNLRnUIKiforlqOjvVJvK/tU8LYSTwH/WHtQXEoQmc3BRy2edyFLeufx+Lo7 rorXEb1vugWmm12d1uHM/BlvEjrLZCs+PPoldv5ERxyv/8pkC51oor5qiMA+M0UMNBdg slxg== X-Gm-Message-State: AN3rC/5EAaI9OY7wPtwLwiNxMXPACJo+Y5SGcItmAvZ3+ZyoiPeCspXE xnloF1o8CFwiNNN0 X-Received: by 10.28.88.2 with SMTP id m2mr22553562wmb.12.1492028551894; Wed, 12 Apr 2017 13:22:31 -0700 (PDT) Received: from mohikan.hemma.eciton.net ([2a01:348:6:8735:e23f:49ff:fe6d:9d26]) by smtp.gmail.com with ESMTPSA id w16sm5873170wmd.0.2017.04.12.13.22.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Apr 2017 13:22:31 -0700 (PDT) From: Leif Lindholm To: edk2-devel@lists.01.org Date: Wed, 12 Apr 2017 21:22:29 +0100 Message-Id: <20170412202229.28396-1-leif.lindholm@linaro.org> X-Mailer: git-send-email 2.11.0 Subject: [edk2] [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: , Cc: ard.biesheuvel@linaro.org MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" 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 --- ArmPkg/Library/ArmHvcLib/Arm/ArmHvc.S | 2 +- ArmPkg/Library/ArmSmcLib/Arm/ArmSmc.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Ard Biesheuvel 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