linux-kernel - [PATCH v9 01/12] ARM: Allow this header to be included by assembly files

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20180504190545.5114-2-mylene.josserand@bootlin.com>
Date:   Fri,  4 May 2018 21:05:34 +0200
From:   Mylène Josserand <mylene.josserand@...tlin.com>
To:     linux@...linux.org.uk, maxime.ripard@...tlin.com, wens@...e.org,
        marc.zyngier@....com, mark.rutland@....com, robh+dt@...nel.org,
        horms@...ge.net.au, geert@...ux-m68k.org, magnus.damm@...il.com
Cc:     f.fainelli@...il.com, opendmb@...il.com,
        linux-renesas-soc@...r.kernel.org, devicetree@...r.kernel.org,
        clabbe.montjoie@...il.com, quentin.schulz@...tlin.com,
        thomas.petazzoni@...tlin.com, linux-arm-kernel@...ts.infradead.org,
        linux-kernel@...r.kernel.org, mylene.josserand@...tlin.com
Subject: [PATCH v9 01/12] ARM: Allow this header to be included by assembly files

From: Doug Berger <opendmb@...il.com>

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 <opendmb@...il.com>
Signed-off-by: Florian Fainelli <f.fainelli@...il.com>
Signed-off-by: Mylène Josserand <mylene.josserand@...tlin.com>
---
 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 <linux/stringify.h>
-#include <linux/kernel.h>
-
 #define CPUID_ID	0
 #define CPUID_CACHETYPE	1
 #define CPUID_TCM	2
@@ -98,6 +95,11 @@
 /* Qualcomm implemented cores */
 #define ARM_CPU_PART_SCORPION		0x510002d0
 
+#ifndef __ASSEMBLY__
+
+#include <linux/stringify.h>
+#include <linux/kernel.h>
+
 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
-- 
2.11.0