diff options
| author | Jonathan Austin <jonathan.austin@arm.com> | 2013-04-24 11:51:38 +0100 |
|---|---|---|
| committer | Jonathan Austin <jonathan.austin@arm.com> | 2013-06-07 17:02:45 +0100 |
| commit | 8006b4d1a7c70f27a87cb753b5ed90483f0cfe26 (patch) | |
| tree | 40807be9d2be7ad2becb353d2053513459e3fb5f /arch/arm/kernel | |
| parent | aa1aadc3305c4917c39f0291613a5ec81dd4c73b (diff) | |
| download | linux-stable-8006b4d1a7c70f27a87cb753b5ed90483f0cfe26.tar.gz linux-stable-8006b4d1a7c70f27a87cb753b5ed90483f0cfe26.tar.bz2 linux-stable-8006b4d1a7c70f27a87cb753b5ed90483f0cfe26.zip | |
ARM: nommu: Don't build smp_tlb.c for !CONFIG_MMU
Without an MMU we don't need to do any TLB maintenance. Until the addition
of 93dc68876b60 (ARM: 7684/1: errata: Workaround for Cortex-A15 erratum 798181
(TLBI/DSB operations)) building the tlb maintenance ops in smp_tlb.c worked,
though none of the contents were used.
Since that commit, however, SMP NOMMU has not been able to build. This patch
restores that ability by making the building of smp_tlb.c dependent on MMU.
Signed-off-by: Jonathan Austin <jonathan.austin@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
CC: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile index f4285b5ffb05..fccfbdb03df1 100644 --- a/arch/arm/kernel/Makefile +++ b/arch/arm/kernel/Makefile @@ -38,7 +38,10 @@ obj-$(CONFIG_ARTHUR) += arthur.o obj-$(CONFIG_ISA_DMA) += dma-isa.o obj-$(CONFIG_PCI) += bios32.o isa.o obj-$(CONFIG_ARM_CPU_SUSPEND) += sleep.o suspend.o -obj-$(CONFIG_SMP) += smp.o smp_tlb.o +obj-$(CONFIG_SMP) += smp.o +ifdef CONFIG_MMU +obj-$(CONFIG_SMP) += smp_tlb.o +endif obj-$(CONFIG_HAVE_ARM_SCU) += smp_scu.o obj-$(CONFIG_HAVE_ARM_TWD) += smp_twd.o obj-$(CONFIG_ARM_ARCH_TIMER) += arch_timer.o |