diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-23 14:42:30 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-23 14:42:30 +0100 |
| commit | 34471a9168c8bfd7f0d00989a7b0797ad27d585e (patch) | |
| tree | 847af3ec746c6357902cf57c7e12ba55a35eed30 /arch/arm/mach-omap2 | |
| parent | cefd3e71efca6f4ef7f06f1fc507771d76072741 (diff) | |
| parent | 28af690a284dfcb627bd69d0963db1c0f412cb8c (diff) | |
| download | kernel_goldelico_gta04-34471a9168c8bfd7f0d00989a7b0797ad27d585e.zip kernel_goldelico_gta04-34471a9168c8bfd7f0d00989a7b0797ad27d585e.tar.gz kernel_goldelico_gta04-34471a9168c8bfd7f0d00989a7b0797ad27d585e.tar.bz2 | |
Merge branch 'ppi-irq-core-for-rmk' of git://github.com/mzyngier/arm-platforms into devel-stable
Diffstat (limited to 'arch/arm/mach-omap2')
| -rw-r--r-- | arch/arm/mach-omap2/include/mach/entry-macro.S | 14 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/omap-smp.c | 10 |
2 files changed, 5 insertions, 19 deletions
diff --git a/arch/arm/mach-omap2/include/mach/entry-macro.S b/arch/arm/mach-omap2/include/mach/entry-macro.S index ceb8b7e..feb90a1 100644 --- a/arch/arm/mach-omap2/include/mach/entry-macro.S +++ b/arch/arm/mach-omap2/include/mach/entry-macro.S @@ -78,7 +78,7 @@ 4401: ldr \irqstat, [\base, #GIC_CPU_INTACK] ldr \tmp, =1021 bic \irqnr, \irqstat, #0x1c00 - cmp \irqnr, #29 + cmp \irqnr, #15 cmpcc \irqnr, \irqnr cmpne \irqnr, \tmp cmpcs \irqnr, \irqnr @@ -101,18 +101,6 @@ it cs cmpcs \irqnr, \irqnr .endm - - /* As above, this assumes that irqstat and base are preserved */ - - .macro test_for_ltirq, irqnr, irqstat, base, tmp - bic \irqnr, \irqstat, #0x1c00 - mov \tmp, #0 - cmp \irqnr, #29 - itt eq - moveq \tmp, #1 - streq \irqstat, [\base, #GIC_CPU_EOI] - cmp \tmp, #0 - .endm #endif /* CONFIG_SMP */ #else /* MULTI_OMAP2 */ diff --git a/arch/arm/mach-omap2/omap-smp.c b/arch/arm/mach-omap2/omap-smp.c index ce65e93..889464d 100644 --- a/arch/arm/mach-omap2/omap-smp.c +++ b/arch/arm/mach-omap2/omap-smp.c @@ -109,12 +109,10 @@ void __init smp_init_cpus(void) ncores = scu_get_core_count(scu_base); /* sanity check */ - if (ncores > NR_CPUS) { - printk(KERN_WARNING - "OMAP4: no. of cores (%d) greater than configured " - "maximum of %d - clipping\n", - ncores, NR_CPUS); - ncores = NR_CPUS; + if (ncores > nr_cpu_ids) { + pr_warn("SMP: %u cores greater than maximum (%u), clipping\n", + ncores, nr_cpu_ids); + ncores = nr_cpu_ids; } for (i = 0; i < ncores; i++) |