diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-31 10:43:50 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-31 10:43:50 +0100 |
| commit | dc767302872a55c9849aade1719134a2ba7528b0 (patch) | |
| tree | b55bfce70e8a825e9a041b3a96fdf6485589bed1 /arch/arm/net/bpf_jit_32.c | |
| parent | 696e897344f58397b3d463fbb9f9a2f317d720c0 (diff) | |
| parent | 483a53b310dfefdd8c010ba0cc5b2addfaef123f (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Conflicts:
arch/arm/include/asm/hardware/coresight.h
Diffstat (limited to 'arch/arm/net/bpf_jit_32.c')
| -rw-r--r-- | arch/arm/net/bpf_jit_32.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c index 6de423dbd385..78351ca8d51e 100644 --- a/arch/arm/net/bpf_jit_32.c +++ b/arch/arm/net/bpf_jit_32.c @@ -19,6 +19,7 @@ #include <linux/if_vlan.h> #include <asm/cacheflush.h> #include <asm/hwcap.h> +#include <asm/opcodes.h> #include "bpf_jit_32.h" @@ -113,8 +114,11 @@ static u32 jit_udiv(u32 dividend, u32 divisor) static inline void _emit(int cond, u32 inst, struct jit_ctx *ctx) { + inst |= (cond << 28); + inst = __opcode_to_mem_arm(inst); + if (ctx->target != NULL) - ctx->target[ctx->idx] = inst | (cond << 28); + ctx->target[ctx->idx] = inst; ctx->idx++; } |