[PATCH 1/2] arm64: cpufeature: declare enable_cpu_capabilities as static

[PATCH 1/2] arm64: cpufeature: declare enable_cpu_capabilities as static

[Will Deacon]

enable_cpu_capabilities is only called from within cpufeature.c, so it
can be declared static.

Signed-off-by: Will Deacon <will.deacon@arm.com>
---
 arch/arm64/kernel/cpufeature.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c
index d0d607452e1d..504526fa8129 100644
--- a/arch/arm64/kernel/cpufeature.c
+++ b/arch/arm64/kernel/cpufeature.c
@@ -732,7 +732,7 @@ void update_cpu_capabilities(const struct arm64_cpu_capabilities *caps,
  * Run through the enabled capabilities and enable() it on all active
  * CPUs
  */
-void enable_cpu_capabilities(const struct arm64_cpu_capabilities *caps)
+static void enable_cpu_capabilities(const struct arm64_cpu_capabilities *caps)
 {
 	int i;
 
-- 
2.1.4

[PATCH 2/2] arm64: cachetype: fix definitions of ICACHEF_* flags

[Will Deacon]

test_bit and set_bit take the bit number to operate on, rather than a
mask. This patch fixes the ICACHEF_* definitions so that they represent
the bit index in __icache_flags as opposed to the mask returned by the
BIT macro.

Signed-off-by: Will Deacon <will.deacon@arm.com>
---
 arch/arm64/include/asm/cachetype.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/include/asm/cachetype.h b/arch/arm64/include/asm/cachetype.h
index da2fc9e3cedd..f5588692f1d4 100644
--- a/arch/arm64/include/asm/cachetype.h
+++ b/arch/arm64/include/asm/cachetype.h
@@ -34,8 +34,8 @@
 
 #define CTR_L1IP(ctr)	(((ctr) >> CTR_L1IP_SHIFT) & CTR_L1IP_MASK)
 
-#define ICACHEF_ALIASING	BIT(0)
-#define ICACHEF_AIVIVT		BIT(1)
+#define ICACHEF_ALIASING	0
+#define ICACHEF_AIVIVT		1
 
 extern unsigned long __icache_flags;
 
-- 
2.1.4

[PATCH 2/2] arm64: cachetype: fix definitions of ICACHEF_* flags

[Mark Rutland]

On Tue, Oct 27, 2015 at 12:05:55PM +0000, Will Deacon wrote:
> test_bit and set_bit take the bit number to operate on, rather than a
> mask. This patch fixes the ICACHEF_* definitions so that they represent
> the bit index in __icache_flags as opposed to the mask returned by the
> BIT macro.
> 
> Signed-off-by: Will Deacon <will.deacon@arm.com>

At least they were used consistently, so this is a cleanup rather than a
fix.

Reviewed-by: Mark Rutland <mark.rutland@arm.com>

Mark.

> ---
>  arch/arm64/include/asm/cachetype.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm64/include/asm/cachetype.h b/arch/arm64/include/asm/cachetype.h
> index da2fc9e3cedd..f5588692f1d4 100644
> --- a/arch/arm64/include/asm/cachetype.h
> +++ b/arch/arm64/include/asm/cachetype.h
> @@ -34,8 +34,8 @@
>  
>  #define CTR_L1IP(ctr)	(((ctr) >> CTR_L1IP_SHIFT) & CTR_L1IP_MASK)
>  
> -#define ICACHEF_ALIASING	BIT(0)
> -#define ICACHEF_AIVIVT		BIT(1)
> +#define ICACHEF_ALIASING	0
> +#define ICACHEF_AIVIVT		1
>  
>  extern unsigned long __icache_flags;
>  
> -- 
> 2.1.4
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
> 

[PATCH 1/2] arm64: cpufeature: declare enable_cpu_capabilities as static

[Catalin Marinas]

On Tue, Oct 27, 2015 at 12:05:54PM +0000, Will Deacon wrote:
> enable_cpu_capabilities is only called from within cpufeature.c, so it
> can be declared static.
> 
> Signed-off-by: Will Deacon <will.deacon@arm.com>

Both patches queued for 4.4. Thanks.

-- 
Catalin