mvebu: backport mainline patches from kernel 3.13
[openwrt/staging/lynxis/omap.git] / target / linux / mvebu / patches-3.10 / 0163-ARM-mvebu-move-ARMADA_XP_MAX_CPUS-to-armada-370-xp.h.patch
1 From b340059540cbc90412f3e7159dc57a178e0effd6 Mon Sep 17 00:00:00 2001
2 From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
3 Date: Wed, 4 Dec 2013 14:28:59 +0100
4 Subject: [PATCH 163/203] ARM: mvebu: move ARMADA_XP_MAX_CPUS to
5 armada-370-xp.h
6
7 The ARMADA_XP_MAX_CPUS definition was in common.h, which as its name
8 says, is common to all mvebu SoCs. It is more logical to have this XP
9 specific definition in the already existing armada-370-xp.h header
10 file.
11
12 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
13 ---
14 arch/arm/mach-mvebu/armada-370-xp.h | 2 ++
15 arch/arm/mach-mvebu/common.h | 2 --
16 2 files changed, 2 insertions(+), 2 deletions(-)
17
18 --- a/arch/arm/mach-mvebu/armada-370-xp.h
19 +++ b/arch/arm/mach-mvebu/armada-370-xp.h
20 @@ -18,6 +18,8 @@
21 #ifdef CONFIG_SMP
22 #include <linux/cpumask.h>
23
24 +#define ARMADA_XP_MAX_CPUS 4
25 +
26 void armada_mpic_send_doorbell(const struct cpumask *mask, unsigned int irq);
27 void armada_xp_mpic_smp_cpu_init(void);
28 #endif
29 --- a/arch/arm/mach-mvebu/common.h
30 +++ b/arch/arm/mach-mvebu/common.h
31 @@ -15,8 +15,6 @@
32 #ifndef __ARCH_MVEBU_COMMON_H
33 #define __ARCH_MVEBU_COMMON_H
34
35 -#define ARMADA_XP_MAX_CPUS 4
36 -
37 void mvebu_restart(char mode, const char *cmd);
38
39 void armada_370_xp_init_irq(void);