[PATCH 2/3] UefiCpuPkg: Remove double \r

[PATCH 2/3] UefiCpuPkg: Remove double \r

[Joe Richey]

These files have \r\n line endings, but a few lines use \r\r\n which
is not a valid line ending. These lines were causing problems for git
and other tools.

Signed-off-by: Joe Richey <joerichey@google.com>
---
 UefiCpuPkg/Library/CpuCommonFeaturesLib/LimitCpuIdMaxval.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UefiCpuPkg/Library/CpuCommonFeaturesLib/LimitCpuIdMaxval.c b/UefiCpuPkg/Library/CpuCommonFeaturesLib/LimitCpuIdMaxval.c
index 32cd63ede0..906ed65408 100644
--- a/UefiCpuPkg/Library/CpuCommonFeaturesLib/LimitCpuIdMaxval.c
+++ b/UefiCpuPkg/Library/CpuCommonFeaturesLib/LimitCpuIdMaxval.c
@@ -68,7 +68,7 @@ LimitCpuidMaxvalInitialize (
   // The scope of LimitCpuidMaxval bit in the MSR_IA32_MISC_ENABLE is core for below
   // processor type, only program MSR_IA32_MISC_ENABLE for thread 0 in each core.
   //
-  if (IS_PENTIUM_4_PROCESSOR (CpuInfo->DisplayFamily, CpuInfo->DisplayModel) ||

+  if (IS_PENTIUM_4_PROCESSOR (CpuInfo->DisplayFamily, CpuInfo->DisplayModel) ||
       IS_SILVERMONT_PROCESSOR (CpuInfo->DisplayFamily, CpuInfo->DisplayModel) ||
       IS_GOLDMONT_PROCESSOR (CpuInfo->DisplayFamily, CpuInfo->DisplayModel) ||
       IS_CORE_PROCESSOR (CpuInfo->DisplayFamily, CpuInfo->DisplayModel) ||
-- 
2.21.0.1020.gf2820cf01a-goog

Re: [PATCH 2/3] UefiCpuPkg: Remove double \r

[Ni, Ray]

Reviewed-by: Ray Ni <ray.ni@intel.com>

> -----Original Message-----
> From: Joe Richey <joerichey@google.com>
> Sent: Friday, May 10, 2019 4:07 PM
> To: devel@edk2.groups.io
> Cc: Dong, Eric <eric.dong@intel.com>; Ni, Ray <ray.ni@intel.com>; Laszlo
> Ersek <lersek@redhat.com>; Joe Richey <joerichey@google.com>
> Subject: [PATCH 2/3] UefiCpuPkg: Remove double \r
> 
> These files have \r\n line endings, but a few lines use \r\r\n which
> is not a valid line ending. These lines were causing problems for git
> and other tools.
> 
> Signed-off-by: Joe Richey <joerichey@google.com>
> ---
>  UefiCpuPkg/Library/CpuCommonFeaturesLib/LimitCpuIdMaxval.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/UefiCpuPkg/Library/CpuCommonFeaturesLib/LimitCpuIdMaxval.c
> b/UefiCpuPkg/Library/CpuCommonFeaturesLib/LimitCpuIdMaxval.c
> index 32cd63ede0..906ed65408 100644
> --- a/UefiCpuPkg/Library/CpuCommonFeaturesLib/LimitCpuIdMaxval.c
> +++ b/UefiCpuPkg/Library/CpuCommonFeaturesLib/LimitCpuIdMaxval.c
> @@ -68,7 +68,7 @@ LimitCpuidMaxvalInitialize (
>    // The scope of LimitCpuidMaxval bit in the MSR_IA32_MISC_ENABLE is
> core for below
>    // processor type, only program MSR_IA32_MISC_ENABLE for thread 0 in
> each core.
>    //
> -  if (IS_PENTIUM_4_PROCESSOR (CpuInfo->DisplayFamily, CpuInfo-
> >DisplayModel) ||
> 
> +  if (IS_PENTIUM_4_PROCESSOR (CpuInfo->DisplayFamily, CpuInfo-
> >DisplayModel) ||
>        IS_SILVERMONT_PROCESSOR (CpuInfo->DisplayFamily, CpuInfo-
> >DisplayModel) ||
>        IS_GOLDMONT_PROCESSOR (CpuInfo->DisplayFamily, CpuInfo-
> >DisplayModel) ||
>        IS_CORE_PROCESSOR (CpuInfo->DisplayFamily, CpuInfo->DisplayModel)
> ||
> --
> 2.21.0.1020.gf2820cf01a-goog

Re: [PATCH 2/3] UefiCpuPkg: Remove double \r

[Dong, Eric]

Hi Joe,

Reviewed-by: Eric Dong <eric.dong@intel.com>

And pushed:

SHA-1: e2aaec4b080c3480d62a259e42d792c92c4a0f1b

* UefiCpuPkg: Remove double \r

These files have \r\n line endings, but a few lines use \r\r\n which
is not a valid line ending. These lines were causing problems for git
and other tools.

Signed-off-by: Joe Richey <joerichey@google.com>
Review-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>


Thanks,
Eric
> -----Original Message-----
> From: Joe Richey [mailto:joerichey@google.com]
> Sent: Friday, May 10, 2019 4:07 PM
> To: devel@edk2.groups.io
> Cc: Dong, Eric <eric.dong@intel.com>; Ni, Ray <ray.ni@intel.com>; Laszlo
> Ersek <lersek@redhat.com>; Joe Richey <joerichey@google.com>
> Subject: [PATCH 2/3] UefiCpuPkg: Remove double \r
> 
> These files have \r\n line endings, but a few lines use \r\r\n which is not a
> valid line ending. These lines were causing problems for git and other tools.
> 
> Signed-off-by: Joe Richey <joerichey@google.com>
> ---
>  UefiCpuPkg/Library/CpuCommonFeaturesLib/LimitCpuIdMaxval.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/UefiCpuPkg/Library/CpuCommonFeaturesLib/LimitCpuIdMaxval.c
> b/UefiCpuPkg/Library/CpuCommonFeaturesLib/LimitCpuIdMaxval.c
> index 32cd63ede0..906ed65408 100644
> --- a/UefiCpuPkg/Library/CpuCommonFeaturesLib/LimitCpuIdMaxval.c
> +++ b/UefiCpuPkg/Library/CpuCommonFeaturesLib/LimitCpuIdMaxval.c
> @@ -68,7 +68,7 @@ LimitCpuidMaxvalInitialize (
>    // The scope of LimitCpuidMaxval bit in the MSR_IA32_MISC_ENABLE is
> core for below
>    // processor type, only program MSR_IA32_MISC_ENABLE for thread 0 in
> each core.
>    //
> -  if (IS_PENTIUM_4_PROCESSOR (CpuInfo->DisplayFamily, CpuInfo-
> >DisplayModel) ||
> 
> +  if (IS_PENTIUM_4_PROCESSOR (CpuInfo->DisplayFamily,
> + CpuInfo->DisplayModel) ||
>        IS_SILVERMONT_PROCESSOR (CpuInfo->DisplayFamily, CpuInfo-
> >DisplayModel) ||
>        IS_GOLDMONT_PROCESSOR (CpuInfo->DisplayFamily, CpuInfo-
> >DisplayModel) ||
>        IS_CORE_PROCESSOR (CpuInfo->DisplayFamily, CpuInfo->DisplayModel)
> ||
> --
> 2.21.0.1020.gf2820cf01a-goog