| 12345678910111213141516171819202122232425262728293031323334353637383940 |
- --- a/arch/arm/mach-cns3xxx/Kconfig
- +++ b/arch/arm/mach-cns3xxx/Kconfig
- @@ -5,6 +5,7 @@ menuconfig ARCH_CNS3XXX
- select HAVE_ARM_SCU if SMP
- select HAVE_ARM_TWD if LOCAL_TIMERS
- select HAVE_SMP
- + select FIQ
- help
- Support for Cavium Networks CNS3XXX platform.
-
- --- a/arch/arm/mach-cns3xxx/Makefile
- +++ b/arch/arm/mach-cns3xxx/Makefile
- @@ -6,5 +6,5 @@ cns3xxx-$(CONFIG_ATAGS) += devices.o
- cns3xxx-$(CONFIG_PCI) += pcie.o
- CFLAGS_pcie.o += -Wframe-larger-than=1536 # override default 1024, this is safe here
- cns3xxx-$(CONFIG_MACH_CNS3420VB) += cns3420vb.o
- -cns3xxx-$(CONFIG_SMP) += platsmp.o headsmp.o
- +cns3xxx-$(CONFIG_SMP) += platsmp.o headsmp.o cns3xxx_fiq.o
- cns3xxx-$(CONFIG_HOTPLUG_CPU) += hotplug.o
- --- a/arch/arm/mach-cns3xxx/cns3xxx.h
- +++ b/arch/arm/mach-cns3xxx/cns3xxx.h
- @@ -267,6 +267,7 @@
- #define MISC_PCIE_INT_MASK(x) MISC_MEM_MAP(0x978 + (x) * 0x100)
- #define MISC_PCIE_INT_STATUS(x) MISC_MEM_MAP(0x97C + (x) * 0x100)
-
- +#define MISC_FIQ_CPU(x) MISC_MEM_MAP(0xA58 - (x) * 0x4)
- /*
- * Power management and clock control
- */
- --- a/arch/arm/mm/Kconfig
- +++ b/arch/arm/mm/Kconfig
- @@ -827,7 +827,7 @@ config KUSER_HELPERS
-
- config DMA_CACHE_RWFO
- bool "Enable read/write for ownership DMA cache maintenance"
- - depends on CPU_V6K && SMP
- + depends on CPU_V6K && SMP && !ARCH_CNS3XXX
- default y
- help
- The Snoop Control Unit on ARM11MPCore does not detect the
|
