mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-07-19 17:26:28 +00:00
Merge pull request #2435 from rn/karm64
Converge arm64 and x86 kernel configs
This commit is contained in:
commit
6f14a2acda
@ -514,7 +514,7 @@ CONFIG_BOUNCE=y
|
|||||||
CONFIG_VIRT_TO_BUS=y
|
CONFIG_VIRT_TO_BUS=y
|
||||||
CONFIG_MMU_NOTIFIER=y
|
CONFIG_MMU_NOTIFIER=y
|
||||||
CONFIG_KSM=y
|
CONFIG_KSM=y
|
||||||
CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
|
CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
|
||||||
CONFIG_TRANSPARENT_HUGEPAGE=y
|
CONFIG_TRANSPARENT_HUGEPAGE=y
|
||||||
CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
|
CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
|
||||||
# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
|
# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
|
||||||
@ -1736,7 +1736,12 @@ CONFIG_DUMMY=m
|
|||||||
# CONFIG_EQUALIZER is not set
|
# CONFIG_EQUALIZER is not set
|
||||||
# CONFIG_NET_FC is not set
|
# CONFIG_NET_FC is not set
|
||||||
# CONFIG_IFB is not set
|
# CONFIG_IFB is not set
|
||||||
# CONFIG_NET_TEAM is not set
|
CONFIG_NET_TEAM=m
|
||||||
|
CONFIG_NET_TEAM_MODE_BROADCAST=m
|
||||||
|
CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
|
||||||
|
CONFIG_NET_TEAM_MODE_RANDOM=m
|
||||||
|
CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
|
||||||
|
CONFIG_NET_TEAM_MODE_LOADBALANCE=m
|
||||||
CONFIG_MACVLAN=y
|
CONFIG_MACVLAN=y
|
||||||
CONFIG_MACVTAP=y
|
CONFIG_MACVTAP=y
|
||||||
CONFIG_IPVLAN=y
|
CONFIG_IPVLAN=y
|
||||||
@ -1827,8 +1832,7 @@ CONFIG_MLX5_CORE_EN=y
|
|||||||
# CONFIG_NET_VENDOR_MYRI is not set
|
# CONFIG_NET_VENDOR_MYRI is not set
|
||||||
# CONFIG_FEALNX is not set
|
# CONFIG_FEALNX is not set
|
||||||
# CONFIG_NET_VENDOR_NATSEMI is not set
|
# CONFIG_NET_VENDOR_NATSEMI is not set
|
||||||
CONFIG_NET_VENDOR_NETRONOME=y
|
# CONFIG_NET_VENDOR_NETRONOME is not set
|
||||||
# CONFIG_NFP_NETVF is not set
|
|
||||||
# CONFIG_NET_VENDOR_NVIDIA is not set
|
# CONFIG_NET_VENDOR_NVIDIA is not set
|
||||||
# CONFIG_NET_VENDOR_OKI is not set
|
# CONFIG_NET_VENDOR_OKI is not set
|
||||||
# CONFIG_ETHOC is not set
|
# CONFIG_ETHOC is not set
|
||||||
@ -3376,7 +3380,7 @@ CONFIG_DEBUG_INFO_SPLIT=y
|
|||||||
# CONFIG_DEBUG_INFO_DWARF4 is not set
|
# CONFIG_DEBUG_INFO_DWARF4 is not set
|
||||||
# CONFIG_GDB_SCRIPTS is not set
|
# CONFIG_GDB_SCRIPTS is not set
|
||||||
# CONFIG_ENABLE_WARN_DEPRECATED is not set
|
# CONFIG_ENABLE_WARN_DEPRECATED is not set
|
||||||
# CONFIG_ENABLE_MUST_CHECK is not set
|
CONFIG_ENABLE_MUST_CHECK=y
|
||||||
CONFIG_FRAME_WARN=1024
|
CONFIG_FRAME_WARN=1024
|
||||||
# CONFIG_STRIP_ASM_SYMS is not set
|
# CONFIG_STRIP_ASM_SYMS is not set
|
||||||
# CONFIG_READABLE_ASM is not set
|
# CONFIG_READABLE_ASM is not set
|
||||||
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user