diff options
| author | Jon Medhurst (Tixy) <tixy@linaro.org> | 2013-07-22 16:03:33 +0100 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-11-08 15:57:30 +0400 |
| commit | 1a7e85c2d092d23e20f86434ba1d213b4e4d092c (patch) | |
| tree | 9c2215c2cd821a45b10c361a661d4c16c8306c55 | |
| parent | ab962aeee7824127d6a33d85c2c17a761ff75068 (diff) | |
Fixup IKS and Android mergetracking-fixup_iks_linaro-android-llct-20131112.0
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 <tixy@linaro.org>
Date: Mon, 22 Jul 2013 15:37:29 +0100
Subject: [PATCH] Fixup IKS and Android merge
Signed-off-by: Jon Medhurst <tixy@linaro.org>
| -rw-r--r-- | arch/arm/include/asm/hardirq.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 <linux/threads.h> #include <asm/irq.h> -#define NR_IPI 7 +#define NR_IPI 8 typedef struct { unsigned int __softirq_pending; |