Disable BFP JIT on ARMv7 as it's currently broken, Remove forced console on aarch64, legacy config (rhbz 1594402)

12 files changed, 20 insertions, 11 deletions

diff --git a/configs/fedora/generic/arm/armv7/CONFIG_CMDLINE b/configs/fedora/generic/arm/CONFIG_CMDLINE
index f3083e1e5..f3083e1e5 100644
--- a/configs/fedora/generic/arm/armv7/CONFIG_CMDLINE
+++ b/configs/fedora/generic/arm/CONFIG_CMDLINE
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_CMDLINE_FORCE b/configs/fedora/generic/arm/CONFIG_CMDLINE_FORCE
index db59f3770..db59f3770 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_CMDLINE_FORCE
+++ b/configs/fedora/generic/arm/CONFIG_CMDLINE_FORCE
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_CMDLINE b/configs/fedora/generic/arm/aarch64/CONFIG_CMDLINE
deleted file mode 100644
index f218410dc..000000000
--- a/configs/fedora/generic/arm/aarch64/CONFIG_CMDLINE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CMDLINE="console=ttyAMA0"
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_BPF_JIT b/configs/fedora/generic/arm/armv7/CONFIG_BPF_JIT
new file mode 100644
index 000000000..7905dce5c
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/CONFIG_BPF_JIT
@@ -0,0 +1 @@
+# CONFIG_BPF_JIT is not set
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_BPF_JIT_ALWAYS_ON b/configs/fedora/generic/arm/armv7/CONFIG_BPF_JIT_ALWAYS_ON
new file mode 100644
index 000000000..faae023d4
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/CONFIG_BPF_JIT_ALWAYS_ON
@@ -0,0 +1 @@
+# CONFIG_BPF_JIT_ALWAYS_ON is not set
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index af7c0cf9b..8a6bf510a 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -948,7 +948,7 @@ CONFIG_CMA_SIZE_SEL_MBYTES=y
 # CONFIG_CMA_SIZE_SEL_MIN is not set
 # CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
 CONFIG_CMA=y
-CONFIG_CMDLINE="console=ttyAMA0"
+CONFIG_CMDLINE=""
 # CONFIG_CMDLINE_FORCE is not set
 # CONFIG_CMDLINE_PARTITION is not set
 CONFIG_CNIC=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 20f01a4ae..4f87ebc5f 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -948,7 +948,7 @@ CONFIG_CMA_SIZE_SEL_MBYTES=y
 # CONFIG_CMA_SIZE_SEL_MIN is not set
 # CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
 CONFIG_CMA=y
-CONFIG_CMDLINE="console=ttyAMA0"
+CONFIG_CMDLINE=""
 # CONFIG_CMDLINE_FORCE is not set
 # CONFIG_CMDLINE_PARTITION is not set
 CONFIG_CNIC=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 5870c84d6..df75608e2 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -686,8 +686,8 @@ CONFIG_BONDING=m
 CONFIG_BOOT_PRINTK_DELAY=y
 CONFIG_BOUNCE=y
 # CONFIG_BPFILTER is not set
-CONFIG_BPF_JIT_ALWAYS_ON=y
-CONFIG_BPF_JIT=y
+# CONFIG_BPF_JIT_ALWAYS_ON is not set
+# CONFIG_BPF_JIT is not set
 CONFIG_BPF_KPROBE_OVERRIDE=y
 CONFIG_BPF_STREAM_PARSER=y
 CONFIG_BPF_SYSCALL=y
@@ -989,6 +989,7 @@ CONFIG_CMA_SIZE_SEL_MBYTES=y
 # CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
 CONFIG_CMA=y
 CONFIG_CMDLINE=""
+# CONFIG_CMDLINE_FORCE is not set
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
 # CONFIG_CMDLINE_PARTITION is not set
 CONFIG_CNIC=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 20e995be1..e736900dd 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -661,8 +661,8 @@ CONFIG_BONDING=m
 CONFIG_BOOT_PRINTK_DELAY=y
 CONFIG_BOUNCE=y
 # CONFIG_BPFILTER is not set
-CONFIG_BPF_JIT_ALWAYS_ON=y
-CONFIG_BPF_JIT=y
+# CONFIG_BPF_JIT_ALWAYS_ON is not set
+# CONFIG_BPF_JIT is not set
 CONFIG_BPF_KPROBE_OVERRIDE=y
 CONFIG_BPF_STREAM_PARSER=y
 CONFIG_BPF_SYSCALL=y
@@ -959,6 +959,7 @@ CONFIG_CMA_SIZE_SEL_MBYTES=y
 # CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
 CONFIG_CMA=y
 CONFIG_CMDLINE=""
+# CONFIG_CMDLINE_FORCE is not set
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
 # CONFIG_CMDLINE_PARTITION is not set
 CONFIG_CNIC=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 8b97b5846..30bef0eb2 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -660,8 +660,8 @@ CONFIG_BONDING=m
 CONFIG_BOOT_PRINTK_DELAY=y
 CONFIG_BOUNCE=y
 # CONFIG_BPFILTER is not set
-CONFIG_BPF_JIT_ALWAYS_ON=y
-CONFIG_BPF_JIT=y
+# CONFIG_BPF_JIT_ALWAYS_ON is not set
+# CONFIG_BPF_JIT is not set
 # CONFIG_BPF_KPROBE_OVERRIDE is not set
 CONFIG_BPF_STREAM_PARSER=y
 CONFIG_BPF_SYSCALL=y
@@ -958,6 +958,7 @@ CONFIG_CMA_SIZE_SEL_MBYTES=y
 # CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
 CONFIG_CMA=y
 CONFIG_CMDLINE=""
+# CONFIG_CMDLINE_FORCE is not set
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
 # CONFIG_CMDLINE_PARTITION is not set
 CONFIG_CNIC=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index d1ce647c6..095368002 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -685,8 +685,8 @@ CONFIG_BONDING=m
 CONFIG_BOOT_PRINTK_DELAY=y
 CONFIG_BOUNCE=y
 # CONFIG_BPFILTER is not set
-CONFIG_BPF_JIT_ALWAYS_ON=y
-CONFIG_BPF_JIT=y
+# CONFIG_BPF_JIT_ALWAYS_ON is not set
+# CONFIG_BPF_JIT is not set
 # CONFIG_BPF_KPROBE_OVERRIDE is not set
 CONFIG_BPF_STREAM_PARSER=y
 CONFIG_BPF_SYSCALL=y
@@ -988,6 +988,7 @@ CONFIG_CMA_SIZE_SEL_MBYTES=y
 # CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
 CONFIG_CMA=y
 CONFIG_CMDLINE=""
+# CONFIG_CMDLINE_FORCE is not set
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
 # CONFIG_CMDLINE_PARTITION is not set
 CONFIG_CNIC=m
diff --git a/kernel.spec b/kernel.spec
index cfd912659..7be0c96c8 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1840,6 +1840,10 @@ fi
 #
 #
 %changelog
+* Mon Jun 25 2018 Peter Robinson <pbrobinson@fedoraproject.org>
+- Disable BFP JIT on ARMv7 as it's currently broken
+- Remove forced console on aarch64, legacy config (rhbz 1594402)
+
 * Fri Jun 22 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc1.git4.1
 - Linux v4.18-rc1-189-g894b8c000ae6