summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2021-02-02 19:39:13 +0100
committerErich Eckner <git@eckner.net>2021-02-02 19:39:13 +0100
commitd340c96890a40ea96ca3cb551da6fff806977411 (patch)
treeffecef66aff253ba944f9b5251c80201a5e1f672 /core
parent7399a19a7c64edfae23368a622b847d6abbbb65a (diff)
parent733bc8db81d90c5492b1d9464515afffc51a1165 (diff)
downloadpackages-d340c96890a40ea96ca3cb551da6fff806977411.tar.xz
Merge branch 'updates-from-mistersmee'
Diffstat (limited to 'core')
-rw-r--r--core/linux/PKGBUILD4
-rw-r--r--core/linux/config.i4868
-rw-r--r--core/linux/config.i6863
3 files changed, 8 insertions, 7 deletions
diff --git a/core/linux/PKGBUILD b/core/linux/PKGBUILD
index 387942c..4d89bda 100644
--- a/core/linux/PKGBUILD
+++ b/core/linux/PKGBUILD
@@ -7,8 +7,8 @@ source_i486=('config.i486')
for ((i=0; i<${#sha256sums[@]}; i++)); do
if [ "${sha256sums[${i}]}" = 'd3e7adf5fcfc632887058ca84ca7b849a824dda5a03de854c8d3480ef0124ad1' ]; then
sha256sums_pentium4=('04d3802b7ef5389080e82c29069cffbba83c2dc154a76ffde9f0a14e9766bc6c')
- sha256sums_i686=('f0b6ba00decf5de65c249199565dab4d103e0b39f9b117a413d564042a6361b8')
- sha256sums_i486=('830273c49e75ddc50052d75fb152b7246d41d4d664c72b2dfdeb9be2fd89597c')
+ sha256sums_i686=('377fd35899c94b5250393faa9a7c4d952d9f24215cbc88b0ae2fe9d660b15b1b')
+ sha256sums_i486=('b96bc9a6d5c05c9d34ff89809b20bf1b4455b069c4853174f6be7d10d28828e6')
fi
done
diff --git a/core/linux/config.i486 b/core/linux/config.i486
index c090f41..dc312c9 100644
--- a/core/linux/config.i486
+++ b/core/linux/config.i486
@@ -182,7 +182,7 @@ CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_DEVICE=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_CGROUP_PERF=y
-CONFIG_CGROUP_BPF=y
+# CONFIG_CGROUP_BPF is not set
# CONFIG_CGROUP_DEBUG is not set
CONFIG_SOCK_CGROUP_DATA=y
CONFIG_NAMESPACES=y
@@ -244,7 +244,7 @@ CONFIG_KALLSYMS_ALL=y
CONFIG_KALLSYMS_BASE_RELATIVE=y
CONFIG_BPF_SYSCALL=y
CONFIG_USERMODE_DRIVER=y
-CONFIG_BPF_PRELOAD=y
+# CONFIG_BPF_PRELOAD is not set
CONFIG_BPF_PRELOAD_UMD=m
# CONFIG_USERFAULTFD is not set
CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
@@ -10171,7 +10171,7 @@ CONFIG_UPROBE_EVENTS=y
CONFIG_BPF_EVENTS=y
CONFIG_DYNAMIC_EVENTS=y
CONFIG_PROBE_EVENTS=y
-CONFIG_BPF_KPROBE_OVERRIDE=y
+# CONFIG_BPF_KPROBE_OVERRIDE is not set
CONFIG_FTRACE_MCOUNT_RECORD=y
CONFIG_TRACING_MAP=y
CONFIG_SYNTH_EVENTS=y
@@ -10276,3 +10276,5 @@ CONFIG_TEST_KSTRTOX=y
# CONFIG_HYPERV_TESTING is not set
# end of Kernel Testing and Coverage
# end of Kernel hacking
+# CONFIG_BPF_LIRC_MODE2 is not set
+# CONFIG_BPF_LSM is not set
diff --git a/core/linux/config.i686 b/core/linux/config.i686
index ac6c969..36e1f7f 100644
--- a/core/linux/config.i686
+++ b/core/linux/config.i686
@@ -244,7 +244,7 @@ CONFIG_KALLSYMS_ALL=y
CONFIG_KALLSYMS_BASE_RELATIVE=y
CONFIG_BPF_SYSCALL=y
CONFIG_USERMODE_DRIVER=y
-#CONFIG_BPF_PRELOAD=y
+# CONFIG_BPF_PRELOAD is not set
CONFIG_BPF_PRELOAD_UMD=m
# CONFIG_USERFAULTFD is not set
CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
@@ -10340,5 +10340,4 @@ CONFIG_TEST_KSTRTOX=y
# CONFIG_HYPERV_TESTING is not set
# end of Kernel Testing and Coverage
# end of Kernel hacking
-# CONFIG_BPF_PRELOAD is not set
# CONFIG_BPF_LSM is not set