| Message ID | 20190711142930.68809-3-iii@linux.ibm.com |
|---|---|
| State | Accepted |
| Delegated to: | BPF Maintainers |
| Headers | show |
| Series | selftests/bpf: fix compiling loop{1,2,3}.c on s390 | expand |
On Thu, Jul 11, 2019 at 7:31 AM Ilya Leoshkevich <iii@linux.ibm.com> wrote: > > Also check for __s390__ instead of __s390x__, just in case bpf_helpers.h > is ever used by 32-bit userspace. > > Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com> > --- Acked-by: Andrii Nakryiko <andriin@fb.com> > tools/testing/selftests/bpf/bpf_helpers.h | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/tools/testing/selftests/bpf/bpf_helpers.h b/tools/testing/selftests/bpf/bpf_helpers.h > index 5a3d92c8bec8..73071a94769a 100644 > --- a/tools/testing/selftests/bpf/bpf_helpers.h > +++ b/tools/testing/selftests/bpf/bpf_helpers.h > @@ -315,8 +315,8 @@ static int (*bpf_skb_adjust_room)(void *ctx, __s32 len_diff, __u32 mode, > #if defined(__TARGET_ARCH_x86) > #define bpf_target_x86 > #define bpf_target_defined > -#elif defined(__TARGET_ARCH_s930x) > - #define bpf_target_s930x > +#elif defined(__TARGET_ARCH_s390) > + #define bpf_target_s390 > #define bpf_target_defined > #elif defined(__TARGET_ARCH_arm) > #define bpf_target_arm > @@ -341,8 +341,8 @@ static int (*bpf_skb_adjust_room)(void *ctx, __s32 len_diff, __u32 mode, > #ifndef bpf_target_defined > #if defined(__x86_64__) > #define bpf_target_x86 > -#elif defined(__s390x__) > - #define bpf_target_s930x > +#elif defined(__s390__) > + #define bpf_target_s390 > #elif defined(__arm__) > #define bpf_target_arm > #elif defined(__aarch64__) > @@ -369,7 +369,7 @@ static int (*bpf_skb_adjust_room)(void *ctx, __s32 len_diff, __u32 mode, > #define PT_REGS_SP(x) ((x)->sp) > #define PT_REGS_IP(x) ((x)->ip) > > -#elif defined(bpf_target_s390x) > +#elif defined(bpf_target_s390) > > #define PT_REGS_PARM1(x) ((x)->gprs[2]) > #define PT_REGS_PARM2(x) ((x)->gprs[3]) > -- > 2.21.0 >
diff --git a/tools/testing/selftests/bpf/bpf_helpers.h b/tools/testing/selftests/bpf/bpf_helpers.h index 5a3d92c8bec8..73071a94769a 100644 --- a/tools/testing/selftests/bpf/bpf_helpers.h +++ b/tools/testing/selftests/bpf/bpf_helpers.h @@ -315,8 +315,8 @@ static int (*bpf_skb_adjust_room)(void *ctx, __s32 len_diff, __u32 mode, #if defined(__TARGET_ARCH_x86) #define bpf_target_x86 #define bpf_target_defined -#elif defined(__TARGET_ARCH_s930x) - #define bpf_target_s930x +#elif defined(__TARGET_ARCH_s390) + #define bpf_target_s390 #define bpf_target_defined #elif defined(__TARGET_ARCH_arm) #define bpf_target_arm @@ -341,8 +341,8 @@ static int (*bpf_skb_adjust_room)(void *ctx, __s32 len_diff, __u32 mode, #ifndef bpf_target_defined #if defined(__x86_64__) #define bpf_target_x86 -#elif defined(__s390x__) - #define bpf_target_s930x +#elif defined(__s390__) + #define bpf_target_s390 #elif defined(__arm__) #define bpf_target_arm #elif defined(__aarch64__) @@ -369,7 +369,7 @@ static int (*bpf_skb_adjust_room)(void *ctx, __s32 len_diff, __u32 mode, #define PT_REGS_SP(x) ((x)->sp) #define PT_REGS_IP(x) ((x)->ip) -#elif defined(bpf_target_s390x) +#elif defined(bpf_target_s390) #define PT_REGS_PARM1(x) ((x)->gprs[2]) #define PT_REGS_PARM2(x) ((x)->gprs[3])
Also check for __s390__ instead of __s390x__, just in case bpf_helpers.h is ever used by 32-bit userspace. Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com> --- tools/testing/selftests/bpf/bpf_helpers.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)