On 09/06/2021 16:37, Cornelia Huck wrote: > Standardize header guards to _ASM_GENERIC_HEADER_H_. > > Signed-off-by: Cornelia Huck <cohuck@xxxxxxxxxx> > --- > lib/asm-generic/atomic.h | 4 ++-- > lib/asm-generic/barrier.h | 6 +++--- > lib/asm-generic/memory_areas.h | 4 ++-- > lib/asm-generic/pci-host-bridge.h | 4 ++-- > 4 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/lib/asm-generic/atomic.h b/lib/asm-generic/atomic.h > index 26b645a7cc18..b09ce95053e7 100644 > --- a/lib/asm-generic/atomic.h > +++ b/lib/asm-generic/atomic.h > @@ -1,5 +1,5 @@ > -#ifndef __ASM_GENERIC_ATOMIC_H__ > -#define __ASM_GENERIC_ATOMIC_H__ > +#ifndef _ASM_GENERIC_ATOMIC_H_ > +#define _ASM_GENERIC_ATOMIC_H_ > > /* From QEMU include/qemu/atomic.h */ > #define atomic_fetch_inc(ptr) __sync_fetch_and_add(ptr, 1) > diff --git a/lib/asm-generic/barrier.h b/lib/asm-generic/barrier.h > index 6a990ff8d5a5..5499a5664d4d 100644 > --- a/lib/asm-generic/barrier.h > +++ b/lib/asm-generic/barrier.h > @@ -1,5 +1,5 @@ > -#ifndef _ASM_BARRIER_H_ > -#define _ASM_BARRIER_H_ > +#ifndef _ASM_GENERIC_BARRIER_H_ > +#define _ASM_GENERIC_BARRIER_H_ > /* > * asm-generic/barrier.h > * > @@ -32,4 +32,4 @@ > #define cpu_relax() asm volatile ("":::"memory") > #endif > > -#endif /* _ASM_BARRIER_H_ */ > +#endif /* _ASM_GENERIC_BARRIER_H_ */ > diff --git a/lib/asm-generic/memory_areas.h b/lib/asm-generic/memory_areas.h > index 3074afe23393..c86db255ecee 100644 > --- a/lib/asm-generic/memory_areas.h > +++ b/lib/asm-generic/memory_areas.h > @@ -1,5 +1,5 @@ > -#ifndef __ASM_GENERIC_MEMORY_AREAS_H__ > -#define __ASM_GENERIC_MEMORY_AREAS_H__ > +#ifndef _ASM_GENERIC_MEMORY_AREAS_H_ > +#define _ASM_GENERIC_MEMORY_AREAS_H_ > > #define AREA_NORMAL_PFN 0 > #define AREA_NORMAL_NUMBER 0 > diff --git a/lib/asm-generic/pci-host-bridge.h b/lib/asm-generic/pci-host-bridge.h > index 9e91499b9446..174ff341dd0d 100644 > --- a/lib/asm-generic/pci-host-bridge.h > +++ b/lib/asm-generic/pci-host-bridge.h > @@ -1,5 +1,5 @@ > -#ifndef _ASM_PCI_HOST_BRIDGE_H_ > -#define _ASM_PCI_HOST_BRIDGE_H_ > +#ifndef _ASM_GENERIC_PCI_HOST_BRIDGE_H_ > +#define _ASM_GENERIC_PCI_HOST_BRIDGE_H_ > /* > * Copyright (C) 2016, Red Hat Inc, Alexander Gordeev <agordeev@xxxxxxxxxx> > * > Reviewed-by: Laurent Vivier <lvivier@xxxxxxxxxx>