Merge pull request #580 from wigyori/cc-libpcap
[15.05/openwrt.git] / target / linux / cns3xxx / patches-3.18 / 025-smp_support.patch
1 --- a/arch/arm/mach-cns3xxx/Makefile
2 +++ b/arch/arm/mach-cns3xxx/Makefile
3 @@ -6,3 +6,5 @@ cns3xxx-$(CONFIG_ATAGS)                 += devices.o
4  cns3xxx-$(CONFIG_PCI)                  += pcie.o
5  CFLAGS_pcie.o                          += -Wframe-larger-than=1536 # override default 1024, this is safe here
6  cns3xxx-$(CONFIG_MACH_CNS3420VB)       += cns3420vb.o
7 +cns3xxx-$(CONFIG_SMP)                  += platsmp.o headsmp.o
8 +cns3xxx-$(CONFIG_HOTPLUG_CPU)          += hotplug.o
9 --- a/arch/arm/mach-cns3xxx/Kconfig
10 +++ b/arch/arm/mach-cns3xxx/Kconfig
11 @@ -2,6 +2,9 @@ menuconfig ARCH_CNS3XXX
12         bool "Cavium Networks CNS3XXX family" if ARCH_MULTI_V6
13         select ARM_GIC
14         select PCI_DOMAINS if PCI
15 +       select HAVE_ARM_SCU if SMP
16 +       select HAVE_ARM_TWD if LOCAL_TIMERS
17 +       select HAVE_SMP
18         help
19           Support for Cavium Networks CNS3XXX platform.
20  
21 --- a/arch/arm/mach-cns3xxx/core.h
22 +++ b/arch/arm/mach-cns3xxx/core.h
23 @@ -13,6 +13,7 @@
24  
25  #include <linux/reboot.h>
26  
27 +extern struct smp_operations cns3xxx_smp_ops;
28  extern void cns3xxx_timer_init(void);
29  
30  #ifdef CONFIG_CACHE_L2X0