Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8006b4d1 authored by Jonathan Austin's avatar Jonathan Austin
Browse files

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 93dc6887 (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: default avatarJonathan Austin <jonathan.austin@arm.com>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
CC: Will Deacon <will.deacon@arm.com>
parent aa1aadc3

arch/arm/kernel/Makefile

+4 −1
Original line number Original line Diff line number Diff line
@@ -38,7 +38,10 @@ obj-$(CONFIG_ARTHUR) += arthur.o 
obj-$(CONFIG_ISA_DMA)		+= dma-isa.o

obj-$(CONFIG_ISA_DMA)		+= dma-isa.o

obj-$(CONFIG_PCI)		+= bios32.o isa.o

obj-$(CONFIG_PCI)		+= bios32.o isa.o

obj-$(CONFIG_ARM_CPU_SUSPEND)	+= sleep.o suspend.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_SCU)	+= smp_scu.o

obj-$(CONFIG_HAVE_ARM_TWD)	+= smp_twd.o

obj-$(CONFIG_HAVE_ARM_TWD)	+= smp_twd.o

obj-$(CONFIG_ARM_ARCH_TIMER)	+= arch_timer.o

obj-$(CONFIG_ARM_ARCH_TIMER)	+= arch_timer.o