From: Russell King Date: Sun, 13 Apr 2014 18:43:26 +0000 (+0100) Subject: ARM: remove global cr_no_alignment X-Git-Tag: omap-for-v3.16/fixes-against-rc1~91^2~13^2~5 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0aeb3408ca9773283b0ae63771c4b17f39e204df;p=pandora-kernel.git 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 --- 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) Reading git-diff-tree failed