From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sun, 19 May 2013 00:22:53 +0000 (+0100)
Subject: Merge branch 'for-next' of git://git.pengutronix.de/git/ukl/linux into devel-stable
X-Git-Tag: next-20130527~94^2~2
X-Git-Url: https://git.karo-electronics.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=f150abe1012f2fc7d444d33d651db32435038c11

Merge branch 'for-next' of git://git.pengutronix.de/git/ukl/linux into devel-stable

Pull ARM-v7M support from Uwe Kleine-König:
"All but the last patch were in next since next-20130418 without issues.
The last patch fixes a problem in combination with

  8164f7a (ARM: 7680/1: Detect support for SDIV/UDIV from ISAR0 register)

which triggers a WARN_ON without an implemented read_cpuid_ext.

The branch merges fine into v3.10-rc1 and I'd be happy if you pulled it
for 3.11-rc1. The only missing piece to be able to run a Cortex-M3 is
the irqchip driver that will go in via Thomas Gleixner and platform
specific stuff."
---

f150abe1012f2fc7d444d33d651db32435038c11
diff --cc arch/arm/kernel/setup.c
index 1522c7ae31b0,829124590e4c..ea5cd6e3beb6
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@@ -390,8 -384,9 +401,9 @@@ static void __init feat_v6_fixup(void
   *
   * cpu_init sets up the per-CPU stacks.
   */
 -void cpu_init(void)
 +void notrace cpu_init(void)
  {
+ #ifndef CONFIG_CPU_V7M
  	unsigned int cpu = smp_processor_id();
  	struct stack *stk = &stacks[cpu];