lkml.org 
[lkml]   [2014]   [Mar]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[RFC PATCH 1/7] ARM: allow <asm/cputype.h> inclusion from assembly
Date
Conditionally exclude some portions of ARM <asm/cputype.h>
to allow that file to be included from assembly source.

Signed-off-by: Alex Elder <elder@linaro.org>
---
arch/arm/include/asm/cputype.h | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/arch/arm/include/asm/cputype.h b/arch/arm/include/asm/cputype.h
index acdde76..a74c671 100644
--- a/arch/arm/include/asm/cputype.h
+++ b/arch/arm/include/asm/cputype.h
@@ -2,7 +2,9 @@
#define __ASM_ARM_CPUTYPE_H

#include <linux/stringify.h>
+#ifndef __ASSEMBLY__
#include <linux/kernel.h>
+#endif

#define CPUID_ID 0
#define CPUID_CACHETYPE 1
@@ -77,6 +79,7 @@
#define ARM_CPU_XSCALE_ARCH_V2 0x4000
#define ARM_CPU_XSCALE_ARCH_V3 0x6000

+#ifndef __ASSEMBLY__
extern unsigned int processor_id;

#ifdef CONFIG_CPU_CP15
@@ -219,5 +222,6 @@ static inline int cpu_is_xsc3(void)
#else
#define cpu_is_xscale() 1
#endif
+#endif /* !__ASSEMBLY__ */

#endif
--
1.7.9.5


\
 
 \ /
  Last update: 2014-03-28 22:41    [W:0.083 / U:0.324 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site