diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-04-13 20:43:26 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-06-02 10:20:18 +0200 |
| commit | 0aeb3408ca9773283b0ae63771c4b17f39e204df (patch) | |
| tree | cfd151a26e9c3b2a4859f983f2db8a345630e269 /arch/arm/include/asm/cp15.h | |
| parent | ARM: remove CPU_CP15 conditional from alignment.c (diff) | |
| download | linux-0aeb3408ca9773283b0ae63771c4b17f39e204df.tar.xz linux-0aeb3408ca9773283b0ae63771c4b17f39e204df.zip | |
ARM: remove global cr_no_alignment
cr_no_alignment is really only used by the alignment code. Since we no
longer change the setting of cr_alignment after boot, we can localise
this to alignment.c
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/include/asm/cp15.h')
| -rw-r--r-- | arch/arm/include/asm/cp15.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/include/asm/cp15.h b/arch/arm/include/asm/cp15.h index ebae45d7f017..c3f11524f10c 100644 --- a/arch/arm/include/asm/cp15.h +++ b/arch/arm/include/asm/cp15.h @@ -49,7 +49,6 @@ #ifdef CONFIG_CPU_CP15 -extern unsigned long cr_no_alignment; /* defined in entry-armv.S */ extern unsigned long cr_alignment; /* defined in entry-armv.S */ static inline unsigned long get_cr(void) @@ -102,11 +101,10 @@ static inline void set_copro_access(unsigned int val) #else /* ifdef CONFIG_CPU_CP15 */ /* - * cr_alignment and cr_no_alignment are tightly coupled to cp15 (at least in the - * minds of the developers). Yielding 0 for machines without a cp15 (and making - * it read-only) is fine for most cases and saves quite some #ifdeffery. + * cr_alignment is tightly coupled to cp15 (at least in the minds of the + * developers). Yielding 0 for machines without a cp15 (and making it + * read-only) is fine for most cases and saves quite some #ifdeffery. */ -#define cr_no_alignment UL(0) #define cr_alignment UL(0) static inline unsigned long get_cr(void) |