diff options
author | Ben Dooks <ben.dooks@codethink.co.uk> | 2013-07-24 10:44:56 -0400 |
---|---|---|
committer | Ben Dooks <ben.dooks@codethink.co.uk> | 2013-10-19 15:46:35 -0400 |
commit | 3460743e025addc1ecbd496db2231181a2431774 (patch) | |
tree | 18ec651f6425d4eae9e952f5cec6df8ab15effa6 /arch/arm | |
parent | bfdef3b32d2f36bf137c039de9a545cdfcfbafe2 (diff) |
ARM: net: fix arm instruction endian-ness in bpf_jit_32.c
Use <asm/opcodes.h> to correctly transform instruction byte ordering
into in-memory ordering.
Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
Reviewed-by: Dave Martin <Dave.Martin@arm.com>
Diffstat (limited to 'arch/arm')
-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 f50d223a0bd3..510d923ef6fd 100644 --- a/arch/arm/net/bpf_jit_32.c +++ b/arch/arm/net/bpf_jit_32.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <linux/if_vlan.h> | 19 | #include <linux/if_vlan.h> |
20 | #include <asm/cacheflush.h> | 20 | #include <asm/cacheflush.h> |
21 | #include <asm/hwcap.h> | 21 | #include <asm/hwcap.h> |
22 | #include <asm/opcodes.h> | ||
22 | 23 | ||
23 | #include "bpf_jit_32.h" | 24 | #include "bpf_jit_32.h" |
24 | 25 | ||
@@ -113,8 +114,11 @@ static u32 jit_udiv(u32 dividend, u32 divisor) | |||
113 | 114 | ||
114 | static inline void _emit(int cond, u32 inst, struct jit_ctx *ctx) | 115 | static inline void _emit(int cond, u32 inst, struct jit_ctx *ctx) |
115 | { | 116 | { |
117 | inst |= (cond << 28); | ||
118 | inst = __opcode_to_mem_arm(inst); | ||
119 | |||
116 | if (ctx->target != NULL) | 120 | if (ctx->target != NULL) |
117 | ctx->target[ctx->idx] = inst | (cond << 28); | 121 | ctx->target[ctx->idx] = inst; |
118 | 122 | ||
119 | ctx->idx++; | 123 | ctx->idx++; |
120 | } | 124 | } |