1. Patchew
  2. EDK2
  3. View series

[edk2] [PATCH] ArmPkg: copy/paste fixes in ARM ArmHvcLib/ArmSmcLib

Leif Lindholm posted 1 patch 7 years, 6 months ago
Failed in applying to current master (apply log)
ArmPkg/Library/ArmHvcLib/Arm/ArmHvc.S | 2 +-
ArmPkg/Library/ArmSmcLib/Arm/ArmSmc.S | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
[edk2] [PATCH] ArmPkg: copy/paste fixes in ARM ArmHvcLib/ArmSmcLib
Posted by Leif Lindholm 7 years, 6 months ago 
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 <leif.lindholm@linaro.org>
---
 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 <AsmMacroIoLibV8.h>
+#include <AsmMacroIoLib.h>
 
 .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 <AsmMacroIoLibV8.h>
+#include <AsmMacroIoLib.h>
 
 .arch_extension sec
 
-- 
2.11.0

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH] ArmPkg: copy/paste fixes in ARM ArmHvcLib/ArmSmcLib
Posted by Ard Biesheuvel 7 years, 6 months ago 
On 12 April 2017 at 21:22, Leif Lindholm <leif.lindholm@linaro.org> 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 <leif.lindholm@linaro.org>

Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

> ---
>  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 <AsmMacroIoLibV8.h>
> +#include <AsmMacroIoLib.h>
>
>  .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 <AsmMacroIoLibV8.h>
> +#include <AsmMacroIoLib.h>
>
>  .arch_extension sec
>
> --
> 2.11.0
>
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH] ArmPkg: copy/paste fixes in ARM ArmHvcLib/ArmSmcLib
Posted by Leif Lindholm 7 years, 6 months ago 
On Thu, Apr 13, 2017 at 08:32:32AM +0100, Ard Biesheuvel wrote:
> On 12 April 2017 at 21:22, Leif Lindholm <leif.lindholm@linaro.org> 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 <leif.lindholm@linaro.org>
> 
> Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

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 <AsmMacroIoLibV8.h>
> > +#include <AsmMacroIoLib.h>
> >
> >  .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 <AsmMacroIoLibV8.h>
> > +#include <AsmMacroIoLib.h>
> >
> >  .arch_extension sec
> >
> > --
> > 2.11.0
> >
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Patchew 2.1-devel-b67e4c2

© 2016 - 2024 Red Hat, Inc.