Commit 17e49a9e authored May 04, 2018 by Doug Berger Committed by Maxime Ripard May 08, 2018

ARM: Allow this header to be included by assembly files



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 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@gmail.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Mylène Josserand <mylene.josserand@bootlin.com>
Acked-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>

parent 60cc43fc

arch/arm/include/asm/cputype.h

+7 −3

Original line number	Diff line number	Diff line
		@@ -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