diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-09-28 20:30:06 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-10-09 23:48:39 +0400 |
| commit | 21fafb3d0d7921ed9d119b334d9796eb89c30d75 (patch) | |
| tree | 6785ef89da7863f988ee2967acb016324f14d623 | |
| parent | 8ec890d370b80209dbc634d0d2d64a1d83ef4c6e (diff) | |
Workaround for Origen boot failure with CONFIG_OF enabledtracking-ll-last-minute-fixes-ll-20121009.0
This is because cpuif_logical_map() is used before it is initialized
if CONFIG_GIC_NON_BANKED is enabled, and percpu_offest is provided.
This temporary workaround is the result of discussion between Tushar
Behera <tushar.behera@linaro.org>, Jon Medhurst (Tixy) <tixy@linaro.org>
and Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>.
CC: Tushar Behera <tushar.behera@linaro.org>
CC: Jon Medhurst (Tixy) <tixy@linaro.org>
CC: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>
| -rw-r--r-- | arch/arm/common/gic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/common/gic.c b/arch/arm/common/gic.c index 7fa82240d083..4d264beaeafc 100644 --- a/arch/arm/common/gic.c +++ b/arch/arm/common/gic.c @@ -755,7 +755,7 @@ void __init gic_init_bases(unsigned int gic_nr, int irq_start, for_each_possible_cpu(cpu) { unsigned long offset = - percpu_offset * cpuif_logical_map(cpu); + percpu_offset * cpu_logical_map(cpu); *per_cpu_ptr(gic->dist_base.percpu_base, cpu) = dist_base + offset; *per_cpu_ptr(gic->cpu_base.percpu_base, cpu) = cpu_base + offset; } |