| Message ID | 20220414223704.341028-5-alobakin@pm.me (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | BPF |
| Headers | show |
| Series | bpf: random unpopular userspace fixes (32 bit et al.) | expand |
| Context | Check | Description |
|---|---|---|
| bpf/vmtest-bpf-next-PR | success | PR summary |
| netdev/tree_selection | success | Clearly marked for bpf-next, async |
| netdev/fixes_present | success | Fixes tag not required for -next series |
| netdev/subject_prefix | success | Link |
| netdev/cover_letter | success | Series has a cover letter |
| netdev/patch_count | success | Link |
| netdev/header_inline | success | No static functions without inline keyword in header files |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/cc_maintainers | success | CCed 14 of 14 maintainers |
| netdev/build_clang | success | Errors and warnings before: 0 this patch: 0 |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Signed-off-by tag matches author and committer |
| netdev/verify_fixes | success | Fixes tag looks correct |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 9 lines checked |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/source_inline | success | Was 0 now: 0 |
| bpf/vmtest-bpf-next-VM_Test-1 | success | Logs for Kernel LATEST on ubuntu-latest + selftests |
| bpf/vmtest-bpf-next-VM_Test-2 | success | Logs for Kernel LATEST on z15 + selftests |
On Thu, Apr 14, 2022 at 3:45 PM Alexander Lobakin <alobakin@pm.me> wrote: > > Fix the following: > > In file included from samples/bpf/tracex2_kern.c:7: > In file included from ./include/linux/skbuff.h:13: > In file included from ./include/linux/kernel.h:22: > In file included from ./include/linux/bitops.h:33: > In file included from ./arch/mips/include/asm/bitops.h:20: > In file included from ./arch/mips/include/asm/barrier.h:11: > ./arch/mips/include/asm/addrspace.h:13:10: fatal error: 'spaces.h' file not found > #include <spaces.h> > ^~~~~~~~~~ > > 'arch/mips/include/asm/mach-generic' should always be included as > many other MIPS include files rely on this. > Move it from under CONFIG_MACH_LOONGSON64 to let it be included > for every MIPS. > > Fixes: 058107abafc7 ("samples/bpf: Add include dir for MIPS Loongson64 to fix build errors") > Signed-off-by: Alexander Lobakin <alobakin@pm.me> Acked-by: Song Liu <songliubraving@fb.com> > --- > samples/bpf/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile > index 8fff5ad3444b..97203c0de252 100644 > --- a/samples/bpf/Makefile > +++ b/samples/bpf/Makefile > @@ -193,8 +193,8 @@ ifeq ($(ARCH), mips) > TPROGS_CFLAGS += -D__SANE_USERSPACE_TYPES__ > ifdef CONFIG_MACH_LOONGSON64 > BPF_EXTRA_CFLAGS += -I$(srctree)/arch/mips/include/asm/mach-loongson64 > -BPF_EXTRA_CFLAGS += -I$(srctree)/arch/mips/include/asm/mach-generic > endif > +BPF_EXTRA_CFLAGS += -I$(srctree)/arch/mips/include/asm/mach-generic > endif > > TPROGS_CFLAGS += -Wall -O2 > -- > 2.35.2 > >
diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile index 8fff5ad3444b..97203c0de252 100644 --- a/samples/bpf/Makefile +++ b/samples/bpf/Makefile @@ -193,8 +193,8 @@ ifeq ($(ARCH), mips) TPROGS_CFLAGS += -D__SANE_USERSPACE_TYPES__ ifdef CONFIG_MACH_LOONGSON64 BPF_EXTRA_CFLAGS += -I$(srctree)/arch/mips/include/asm/mach-loongson64 -BPF_EXTRA_CFLAGS += -I$(srctree)/arch/mips/include/asm/mach-generic endif +BPF_EXTRA_CFLAGS += -I$(srctree)/arch/mips/include/asm/mach-generic endif TPROGS_CFLAGS += -Wall -O2
Fix the following: In file included from samples/bpf/tracex2_kern.c:7: In file included from ./include/linux/skbuff.h:13: In file included from ./include/linux/kernel.h:22: In file included from ./include/linux/bitops.h:33: In file included from ./arch/mips/include/asm/bitops.h:20: In file included from ./arch/mips/include/asm/barrier.h:11: ./arch/mips/include/asm/addrspace.h:13:10: fatal error: 'spaces.h' file not found #include <spaces.h> ^~~~~~~~~~ 'arch/mips/include/asm/mach-generic' should always be included as many other MIPS include files rely on this. Move it from under CONFIG_MACH_LOONGSON64 to let it be included for every MIPS. Fixes: 058107abafc7 ("samples/bpf: Add include dir for MIPS Loongson64 to fix build errors") Signed-off-by: Alexander Lobakin <alobakin@pm.me> --- samples/bpf/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.35.2