diff options
| author | Jon Medhurst <tixy@linaro.org> | 2012-07-06 10:38:22 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2012-09-05 14:54:52 +0100 |
| commit | 973f3d6870dfa834f679bd94a2b103fc28323430 (patch) | |
| tree | 42d591866f720e134fd7bf70d00b8537360b7aa3 | |
| parent | 129130bc58e350f92c09c2594ed3f1a442aec1b6 (diff) | |
ARM: kernel: Make cpuif_logical_map() cope with absent device-tree
A kernel may be compiled for multiple devices, some of which use
device-tree, and some which don't. To make cpuif_logical_map() work in
the absense of device-trees entries we initialise its table with the
same values as cpu_logical_map().
Signed-off-by: Jon Medhurst <tixy@linaro.org>
| -rw-r--r-- | arch/arm/common/gic.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/common/gic.c b/arch/arm/common/gic.c index 5ff990a765ff..d108cc4e5423 100644 --- a/arch/arm/common/gic.c +++ b/arch/arm/common/gic.c @@ -152,7 +152,10 @@ static void __init gic_init_if_maps(struct gic_chip_data *gic) struct irq_domain *domain = gic->domain; int i; - if (WARN_ON(!domain || !domain->of_node)) + for (i = 0; i < NR_CPUS; i++) + cpuif_logical_map(i) = cpu_logical_map(i); + + if (!domain || !domain->of_node) return; for_each_child_of_node(domain->of_node, gic_cpuif) { |