On 10/06/2021 15:59, Cornelia Huck wrote:
> Some headers had been missed during the initial header guard
> standardization.
>
> Signed-off-by: Cornelia Huck <cohuck@xxxxxxxxxx>
> ---
> configure | 4 ++--
> lib/arm/asm/mmu-api.h | 4 ++--
> lib/arm/asm/mmu.h | 6 +++---
> lib/arm64/asm/mmu.h | 6 +++---
> lib/pci.h | 6 +++---
> 5 files changed, 13 insertions(+), 13 deletions(-)
>
> diff --git a/configure b/configure
> index 4ad5a4bcd782..b8442d61fb60 100755
> --- a/configure
> +++ b/configure
> @@ -332,8 +332,8 @@ if [ "$arch" = "arm" ] || [ "$arch" = "arm64" ]; then
> fi
>
> cat <<EOF > lib/config.h
> -#ifndef CONFIG_H
> -#define CONFIG_H 1
> +#ifndef _CONFIG_H_
> +#define _CONFIG_H_
> /*
> * Generated file. DO NOT MODIFY.
> *
> diff --git a/lib/arm/asm/mmu-api.h b/lib/arm/asm/mmu-api.h
> index 05fc12b5afb8..3d77cbfd8b24 100644
> --- a/lib/arm/asm/mmu-api.h
> +++ b/lib/arm/asm/mmu-api.h
> @@ -1,5 +1,5 @@
> -#ifndef __ASMARM_MMU_API_H_
> -#define __ASMARM_MMU_API_H_
> +#ifndef _ASMARM_MMU_API_H_
> +#define _ASMARM_MMU_API_H_
>
> #include <asm/page.h>
> #include <stdbool.h>
> diff --git a/lib/arm/asm/mmu.h b/lib/arm/asm/mmu.h
> index 94e70f0a84bf..b24b97e554e2 100644
> --- a/lib/arm/asm/mmu.h
> +++ b/lib/arm/asm/mmu.h
> @@ -1,5 +1,5 @@
> -#ifndef __ASMARM_MMU_H_
> -#define __ASMARM_MMU_H_
> +#ifndef _ASMARM_MMU_H_
> +#define _ASMARM_MMU_H_
> /*
> * Copyright (C) 2014, Red Hat Inc, Andrew Jones <drjones@xxxxxxxxxx>
> *
> @@ -53,4 +53,4 @@ static inline void flush_dcache_addr(unsigned long vaddr)
>
> #include <asm/mmu-api.h>
>
> -#endif /* __ASMARM_MMU_H_ */
> +#endif /* _ASMARM_MMU_H_ */
> diff --git a/lib/arm64/asm/mmu.h b/lib/arm64/asm/mmu.h
> index 72371b2d9fe3..5c27edb24d2e 100644
> --- a/lib/arm64/asm/mmu.h
> +++ b/lib/arm64/asm/mmu.h
> @@ -1,5 +1,5 @@
> -#ifndef __ASMARM64_MMU_H_
> -#define __ASMARM64_MMU_H_
> +#ifndef _ASMARM64_MMU_H_
> +#define _ASMARM64_MMU_H_
> /*
> * Copyright (C) 2014, Red Hat Inc, Andrew Jones <drjones@xxxxxxxxxx>
> *
> @@ -35,4 +35,4 @@ static inline void flush_dcache_addr(unsigned long vaddr)
>
> #include <asm/mmu-api.h>
>
> -#endif /* __ASMARM64_MMU_H_ */
> +#endif /* _ASMARM64_MMU_H_ */
> diff --git a/lib/pci.h b/lib/pci.h
> index 689f03ca7647..e201711dfe18 100644
> --- a/lib/pci.h
> +++ b/lib/pci.h
> @@ -1,5 +1,5 @@
> -#ifndef PCI_H
> -#define PCI_H
> +#ifndef _PCI_H_
> +#define _PCI_H_
> /*
> * API for scanning a PCI bus for a given device, as well to access
> * BAR registers.
> @@ -102,4 +102,4 @@ struct pci_test_dev_hdr {
>
> #define PCI_HEADER_TYPE_MASK 0x7f
>
> -#endif /* PCI_H */
> +#endif /* _PCI_H_ */
>
Reviewed-by: Laurent Vivier <lvivier@xxxxxxxxxx>
