diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-09-28 21:40:00 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-09-28 21:40:00 +0400 |
| commit | cf7cc147966aa3b1faf069b008743b3adf8b7f94 (patch) | |
| tree | b83866397e722075296a0b7482fa15e3554f08e5 | |
| parent | fba658a57c337afaf5f94a0c6b88fc9f4934ba39 (diff) | |
| parent | 95cd619db820f087b8e05d827c42b35242f19a25 (diff) | |
Merge branch 'tracking-ll-last-minute-fixes' into merge-linux-linaroll-20120928.0
| -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 7fa82240d08..4d264beaeaf 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; } |