aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/net
diff options
context:
space:
mode:
authorKaixu Xia <xiakaixu@huawei.com>2015-08-11 04:56:51 -0400
committerDavid S. Miller <davem@davemloft.net>2015-08-11 14:49:40 -0400
commit2c9c3bbbbfe9f7f700c30d9ac40c1abca59d39ee (patch)
tree249a164cebf17e040227ab99be21ffa92f97995d /arch/s390/net
parent15ee8fcdd2d24351022e12a92c764edaf2f60e51 (diff)
bpf: s390: Fix build error caused by the struct bpf_array member name changed
There is a build error that "'struct bpf_array' has no member named 'prog'" on s390. In commit 2a36f0b92eb6 ("bpf: Make the bpf_prog_array_map more generic"), the member 'prog' of struct bpf_array is replaced by 'ptrs'. So this patch fixes it. Fixes: 2a36f0b92eb6 ("bpf: Make the bpf_prog_array_map more generic") Reported-by: Wu Fengguang <fengguang.wu@intel.com> Signed-off-by: Kaixu Xia <xiakaixu@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/s390/net')
-rw-r--r--arch/s390/net/bpf_jit_comp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/net/bpf_jit_comp.c b/arch/s390/net/bpf_jit_comp.c
index 9f4bbc09bf07..eeda051442c3 100644
--- a/arch/s390/net/bpf_jit_comp.c
+++ b/arch/s390/net/bpf_jit_comp.c
@@ -1032,7 +1032,7 @@ static noinline int bpf_jit_insn(struct bpf_jit *jit, struct bpf_prog *fp, int i
1032 MAX_TAIL_CALL_CNT, 0, 0x2); 1032 MAX_TAIL_CALL_CNT, 0, 0x2);
1033 1033
1034 /* 1034 /*
1035 * prog = array->prog[index]; 1035 * prog = array->ptrs[index];
1036 * if (prog == NULL) 1036 * if (prog == NULL)
1037 * goto out; 1037 * goto out;
1038 */ 1038 */
@@ -1041,7 +1041,7 @@ static noinline int bpf_jit_insn(struct bpf_jit *jit, struct bpf_prog *fp, int i
1041 EMIT6_DISP_LH(0xeb000000, 0x000d, REG_1, BPF_REG_3, REG_0, 3); 1041 EMIT6_DISP_LH(0xeb000000, 0x000d, REG_1, BPF_REG_3, REG_0, 3);
1042 /* lg %r1,prog(%b2,%r1) */ 1042 /* lg %r1,prog(%b2,%r1) */
1043 EMIT6_DISP_LH(0xe3000000, 0x0004, REG_1, BPF_REG_2, 1043 EMIT6_DISP_LH(0xe3000000, 0x0004, REG_1, BPF_REG_2,
1044 REG_1, offsetof(struct bpf_array, prog)); 1044 REG_1, offsetof(struct bpf_array, ptrs));
1045 /* clgij %r1,0,0x8,label0 */ 1045 /* clgij %r1,0,0x8,label0 */
1046 EMIT6_PCREL_IMM_LABEL(0xec000000, 0x007d, REG_1, 0, 0, 0x8); 1046 EMIT6_PCREL_IMM_LABEL(0xec000000, 0x007d, REG_1, 0, 0, 0x8);
1047 1047