ARM: prepare armv7.h to be included from assembly source

armv7.h contains some useful constants, but also C prototypes.
To include it also in assembly files, protect the non-assembly
part appropriately.

Signed-off-by: Andre Przywara <andre.przywara@linaro.org>
This commit is contained in:
Andre Przywara 2013-09-19 18:06:39 +02:00 committed by Albert ARIBAUD
parent f04c537629
commit d75ba503a9

View File

@ -7,7 +7,6 @@
*/
#ifndef ARMV7_H
#define ARMV7_H
#include <linux/types.h>
/* Cortex-A9 revisions */
#define MIDR_CORTEX_A9_R0P1 0x410FC091
@ -41,6 +40,9 @@
#define ARMV7_CLIDR_CTYPE_INSTRUCTION_DATA 3
#define ARMV7_CLIDR_CTYPE_UNIFIED 4
#ifndef __ASSEMBLY__
#include <linux/types.h>
/*
* CP15 Barrier instructions
* Please note that we have separate barrier instructions in ARMv7
@ -58,4 +60,6 @@ void v7_outer_cache_inval_all(void);
void v7_outer_cache_flush_range(u32 start, u32 end);
void v7_outer_cache_inval_range(u32 start, u32 end);
#endif /* ! __ASSEMBLY__ */
#endif