bpf: s390: Fix build error caused by the struct bpf_array member name changed
authorKaixu Xia <xiakaixu@huawei.com>
Tue, 11 Aug 2015 08:56:51 +0000 (08:56 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 11 Aug 2015 18:49:40 +0000 (11:49 -0700)
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>
arch/s390/net/bpf_jit_comp.c

index 9f4bbc0..eeda051 100644 (file)
@@ -1032,7 +1032,7 @@ static noinline int bpf_jit_insn(struct bpf_jit *jit, struct bpf_prog *fp, int i
                                      MAX_TAIL_CALL_CNT, 0, 0x2);
 
                /*
-                * prog = array->prog[index];
+                * prog = array->ptrs[index];
                 * if (prog == NULL)
                 *         goto out;
                 */
@@ -1041,7 +1041,7 @@ static noinline int bpf_jit_insn(struct bpf_jit *jit, struct bpf_prog *fp, int i
                EMIT6_DISP_LH(0xeb000000, 0x000d, REG_1, BPF_REG_3, REG_0, 3);
                /* lg %r1,prog(%b2,%r1) */
                EMIT6_DISP_LH(0xe3000000, 0x0004, REG_1, BPF_REG_2,
-                             REG_1, offsetof(struct bpf_array, prog));
+                             REG_1, offsetof(struct bpf_array, ptrs));
                /* clgij %r1,0,0x8,label0 */
                EMIT6_PCREL_IMM_LABEL(0xec000000, 0x007d, REG_1, 0, 0, 0x8);