Re: [PATCH 1/4] ARM: Allow this header to be included by assembly files
On Fri, 23 Feb 2018 13:09:20 -0800, Florian Fainelliwrote: > From: Doug Berger > > The constants defined in this file are equally useful in assembly and C > source files. The arm64 architecture version of this file allows > inclusion in both assembly and C source files, so this this commit adds > that capability to the arm architecture version so that the constants > don't need to be defined in multiple places. > > Signed-off-by: Doug Berger > Signed-off-by: Florian Fainelli > --- Applied to soc/next, thanks! -- Florian
Re: [PATCH 1/4] ARM: Allow this header to be included by assembly files
On Fri, 23 Feb 2018 13:09:20 -0800, Florian Fainelli wrote: > From: Doug Berger > > The constants defined in this file are equally useful in assembly and C > source files. The arm64 architecture version of this file allows > inclusion in both assembly and C source files, so this this commit adds > that capability to the arm architecture version so that the constants > don't need to be defined in multiple places. > > Signed-off-by: Doug Berger > Signed-off-by: Florian Fainelli > --- Applied to soc/next, thanks! -- Florian
Re: [PATCH 1/4] ARM: Allow this header to be included by assembly files
Hello, On Fri, 23 Feb 2018 13:09:20 -0800 Florian Fainelliwrote: > From: Doug Berger > > The constants defined in this file are equally useful in assembly and C > source files. The arm64 architecture version of this file allows > inclusion in both assembly and C source files, so this this commit adds > that capability to the arm architecture version so that the constants > don't need to be defined in multiple places. > > Signed-off-by: Doug Berger > Signed-off-by: Florian Fainelli > --- > arch/arm/include/asm/cputype.h | 10 +++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/include/asm/cputype.h b/arch/arm/include/asm/cputype.h > index cb546425da8a..e7632f536633 100644 > --- a/arch/arm/include/asm/cputype.h > +++ b/arch/arm/include/asm/cputype.h > @@ -2,9 +2,6 @@ > #ifndef __ASM_ARM_CPUTYPE_H > #define __ASM_ARM_CPUTYPE_H > > -#include > -#include > - > #define CPUID_ID 0 > #define CPUID_CACHETYPE 1 > #define CPUID_TCM2 > @@ -98,6 +95,11 @@ > /* Qualcomm implemented cores */ > #define ARM_CPU_PART_SCORPION0x510002d0 > > +#ifndef __ASSEMBLY__ > + > +#include > +#include > + > extern unsigned int processor_id; > > #ifdef CONFIG_CPU_CP15 > @@ -326,4 +328,6 @@ static inline int __attribute_const__ > cpuid_feature_extract_field(u32 features, > #define cpuid_feature_extract(reg, field) \ > cpuid_feature_extract_field(read_cpuid_ext(reg), field) > > +#endif /* __ASSEMBLY__ */ > + > #endif Tested-by: Mylène Josserand Thanks! Best regards, -- Mylène Josserand, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering http://bootlin.com
Re: [PATCH 1/4] ARM: Allow this header to be included by assembly files
Hello, On Fri, 23 Feb 2018 13:09:20 -0800 Florian Fainelli wrote: > From: Doug Berger > > The constants defined in this file are equally useful in assembly and C > source files. The arm64 architecture version of this file allows > inclusion in both assembly and C source files, so this this commit adds > that capability to the arm architecture version so that the constants > don't need to be defined in multiple places. > > Signed-off-by: Doug Berger > Signed-off-by: Florian Fainelli > --- > arch/arm/include/asm/cputype.h | 10 +++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/include/asm/cputype.h b/arch/arm/include/asm/cputype.h > index cb546425da8a..e7632f536633 100644 > --- a/arch/arm/include/asm/cputype.h > +++ b/arch/arm/include/asm/cputype.h > @@ -2,9 +2,6 @@ > #ifndef __ASM_ARM_CPUTYPE_H > #define __ASM_ARM_CPUTYPE_H > > -#include > -#include > - > #define CPUID_ID 0 > #define CPUID_CACHETYPE 1 > #define CPUID_TCM2 > @@ -98,6 +95,11 @@ > /* Qualcomm implemented cores */ > #define ARM_CPU_PART_SCORPION0x510002d0 > > +#ifndef __ASSEMBLY__ > + > +#include > +#include > + > extern unsigned int processor_id; > > #ifdef CONFIG_CPU_CP15 > @@ -326,4 +328,6 @@ static inline int __attribute_const__ > cpuid_feature_extract_field(u32 features, > #define cpuid_feature_extract(reg, field) \ > cpuid_feature_extract_field(read_cpuid_ext(reg), field) > > +#endif /* __ASSEMBLY__ */ > + > #endif Tested-by: Mylène Josserand Thanks! Best regards, -- Mylène Josserand, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering http://bootlin.com