| Message ID | 1633777076-17256-2-git-send-email-yangtiezhu@loongson.cn (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | bpf, mips: Do some small changes | expand |
On Sat, Oct 9, 2021 at 12:58 PM Tiezhu Yang <yangtiezhu@loongson.cn> wrote: > > The config options MIPS_CBPF_JIT and MIPS_EBPF_JIT are useless, remove > them in arch/mips/Kconfig, and then modify arch/mips/net/Makefile. > > Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn> > --- > arch/mips/Kconfig | 9 --------- > arch/mips/net/Makefile | 6 +++--- > 2 files changed, 3 insertions(+), 12 deletions(-) > > diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig > index 38468f4..9b03c78 100644 > --- a/arch/mips/Kconfig > +++ b/arch/mips/Kconfig > @@ -1214,15 +1214,6 @@ config SYS_SUPPORTS_RELOCATABLE > The platform must provide plat_get_fdt() if it selects CONFIG_USE_OF > to allow access to command line and entropy sources. > > -config MIPS_CBPF_JIT > - def_bool y > - depends on BPF_JIT && HAVE_CBPF_JIT > - > -config MIPS_EBPF_JIT > - def_bool y > - depends on BPF_JIT && HAVE_EBPF_JIT > - > - > # > # Endianness selection. Sufficiently obscure so many users don't know what to > # answer,so we try hard to limit the available choices. Also the use of a > diff --git a/arch/mips/net/Makefile b/arch/mips/net/Makefile > index 95e8267..e3e6ae6 100644 > --- a/arch/mips/net/Makefile > +++ b/arch/mips/net/Makefile > @@ -1,10 +1,10 @@ > # SPDX-License-Identifier: GPL-2.0-only > # MIPS networking code > > -obj-$(CONFIG_MIPS_EBPF_JIT) += bpf_jit_comp.o > +obj-$(CONFIG_BPF_JIT) += bpf_jit_comp.o > > ifeq ($(CONFIG_32BIT),y) > - obj-$(CONFIG_MIPS_EBPF_JIT) += bpf_jit_comp32.o > + obj-$(CONFIG_BPF_JIT) += bpf_jit_comp32.o > else > - obj-$(CONFIG_MIPS_EBPF_JIT) += bpf_jit_comp64.o > + obj-$(CONFIG_BPF_JIT) += bpf_jit_comp64.o > endif > -- > 2.1.0 > Looks good to me. Acked-by: Johan Almbladh <johan.almbladh@anyfinetworks.com>
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 38468f4..9b03c78 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -1214,15 +1214,6 @@ config SYS_SUPPORTS_RELOCATABLE The platform must provide plat_get_fdt() if it selects CONFIG_USE_OF to allow access to command line and entropy sources. -config MIPS_CBPF_JIT - def_bool y - depends on BPF_JIT && HAVE_CBPF_JIT - -config MIPS_EBPF_JIT - def_bool y - depends on BPF_JIT && HAVE_EBPF_JIT - - # # Endianness selection. Sufficiently obscure so many users don't know what to # answer,so we try hard to limit the available choices. Also the use of a diff --git a/arch/mips/net/Makefile b/arch/mips/net/Makefile index 95e8267..e3e6ae6 100644 --- a/arch/mips/net/Makefile +++ b/arch/mips/net/Makefile @@ -1,10 +1,10 @@ # SPDX-License-Identifier: GPL-2.0-only # MIPS networking code -obj-$(CONFIG_MIPS_EBPF_JIT) += bpf_jit_comp.o +obj-$(CONFIG_BPF_JIT) += bpf_jit_comp.o ifeq ($(CONFIG_32BIT),y) - obj-$(CONFIG_MIPS_EBPF_JIT) += bpf_jit_comp32.o + obj-$(CONFIG_BPF_JIT) += bpf_jit_comp32.o else - obj-$(CONFIG_MIPS_EBPF_JIT) += bpf_jit_comp64.o + obj-$(CONFIG_BPF_JIT) += bpf_jit_comp64.o endif
The config options MIPS_CBPF_JIT and MIPS_EBPF_JIT are useless, remove them in arch/mips/Kconfig, and then modify arch/mips/net/Makefile. Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn> --- arch/mips/Kconfig | 9 --------- arch/mips/net/Makefile | 6 +++--- 2 files changed, 3 insertions(+), 12 deletions(-)