From 1a7e85c2d092d23e20f86434ba1d213b4e4d092c Mon Sep 17 00:00:00 2001 From: "Jon Medhurst (Tixy)" Date: Mon, 22 Jul 2013 16:03:33 +0100 Subject: Fixup IKS and Android merge Hi Andrey I have two topic branches in the ARM LT tree containing IKS bits suitable for inclusion into llct... tracking-armlt-iks is a rebase of Nicolas's iks branch [1] with the big.LITTLE MP config fragment added. tracking-armlt-iks-cpufreq is the cpufreq bits for IKS. Note, when IKS and Android are merged, there is a fixup required which doesn't show up as a conflict because both topic increase NR_IPI to 7. The fix is to set it to 8 as the patch at the end of this mail does. [1] git://git.linaro.org/people/nico/linux.git iks -- Tixy From: Jon Medhurst Date: Mon, 22 Jul 2013 15:37:29 +0100 Subject: [PATCH] Fixup IKS and Android merge Signed-off-by: Jon Medhurst --- arch/arm/include/asm/hardirq.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/include/asm/hardirq.h b/arch/arm/include/asm/hardirq.h index 3d7351c844aa..fe3ea776dc34 100644 --- a/arch/arm/include/asm/hardirq.h +++ b/arch/arm/include/asm/hardirq.h @@ -5,7 +5,7 @@ #include #include -#define NR_IPI 7 +#define NR_IPI 8 typedef struct { unsigned int __softirq_pending; -- cgit v1.2.3