* [PATCH net-next] bpf: fix the bug "'struct bpf_array' has no member named 'prog'" in s390 architecture
@ 2015-08-11 5:00 Kaixu Xia
2015-08-11 5:35 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Kaixu Xia @ 2015-08-11 5:00 UTC (permalink / raw)
To: fengguang.wu, davem, ast, schwidefsky, heiko.carstens
Cc: linux-kernel, netdev, wangnan0, xiakaixu
'Kbuild test robot' sent me an email about a build error
"'struct bpf_array' has no member named 'prog'" in s390
architecture. This error is caused by commit: 2a36f0b92eb
638dd023870574eb471b1c56be9ad [656/692] bpf: Make the bpf
_prog_array_map more generic. In this patch, the member 'prog'
of struct bpf_array has been replaced by 'ptrs'. So this
patch fix it.
---
arch/s390/net/bpf_jit_comp.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/s390/net/bpf_jit_comp.c b/arch/s390/net/bpf_jit_comp.c
index 9f4bbc0..eeda051 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
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);
--
1.8.3.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next] bpf: fix the bug "'struct bpf_array' has no member named 'prog'" in s390 architecture
2015-08-11 5:00 [PATCH net-next] bpf: fix the bug "'struct bpf_array' has no member named 'prog'" in s390 architecture Kaixu Xia
@ 2015-08-11 5:35 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2015-08-11 5:35 UTC (permalink / raw)
To: xiakaixu
Cc: fengguang.wu, ast, schwidefsky, heiko.carstens, linux-kernel,
netdev, wangnan0
From: Kaixu Xia <xiakaixu@huawei.com>
Date: Tue, 11 Aug 2015 05:00:24 +0000
> 'Kbuild test robot' sent me an email about a build error
> "'struct bpf_array' has no member named 'prog'" in s390
> architecture. This error is caused by commit: 2a36f0b92eb
> 638dd023870574eb471b1c56be9ad [656/692] bpf: Make the bpf
> _prog_array_map more generic. In this patch, the member 'prog'
> of struct bpf_array has been replaced by 'ptrs'. So this
> patch fix it.
Please resubmit with a proper "Fixes: " and "Signed-off-by: "
tags.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-08-11 5:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-11 5:00 [PATCH net-next] bpf: fix the bug "'struct bpf_array' has no member named 'prog'" in s390 architecture Kaixu Xia
2015-08-11 5:35 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).