diff options
| author | Arnd Bergmann | 2015-05-26 17:08:46 +0200 |
|---|---|---|
| committer | Russell King | 2015-05-28 01:29:22 +0200 |
| commit | 6e27549bbcdb35975d5c157a2170b81bcb1291db (patch) | |
| tree | e40f0221bae52eec84e6ed9e998d15c6b8c92631 /arch/arm/include/asm | |
| parent | ARM: 8379/1: disable CONFIG_PTDUMP on !MMU (diff) | |
| download | kernel-qcow2-linux-6e27549bbcdb35975d5c157a2170b81bcb1291db.tar.gz kernel-qcow2-linux-6e27549bbcdb35975d5c157a2170b81bcb1291db.tar.xz kernel-qcow2-linux-6e27549bbcdb35975d5c157a2170b81bcb1291db.zip | |
ARM: 8380/1: bpf: fix NOMMU build
arch/arm/net/built-in.o: In function `bpf_jit_compile':
:(.text+0x2758): undefined reference to `set_memory_ro'
arch/arm/net/built-in.o: In function `bpf_jit_free':
:(.text+0x27ac): undefined reference to `set_memory_rw'
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/include/asm')
| -rw-r--r-- | arch/arm/include/asm/cacheflush.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h index 2d46862e7bef..4812cda8fd17 100644 --- a/arch/arm/include/asm/cacheflush.h +++ b/arch/arm/include/asm/cacheflush.h @@ -482,10 +482,17 @@ static inline void __sync_cache_range_r(volatile void *p, size_t size) : : : "r0","r1","r2","r3","r4","r5","r6","r7", \ "r9","r10","lr","memory" ) +#ifdef CONFIG_MMU int set_memory_ro(unsigned long addr, int numpages); int set_memory_rw(unsigned long addr, int numpages); int set_memory_x(unsigned long addr, int numpages); int set_memory_nx(unsigned long addr, int numpages); +#else +static inline int set_memory_ro(unsigned long addr, int numpages) { return 0; } +static inline int set_memory_rw(unsigned long addr, int numpages) { return 0; } +static inline int set_memory_x(unsigned long addr, int numpages) { return 0; } +static inline int set_memory_nx(unsigned long addr, int numpages) { return 0; } +#endif #ifdef CONFIG_DEBUG_RODATA void mark_rodata_ro(void); |