From d7624e05602b49da23360681c372de06c1b4c7b1 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Jun 25 2018 16:53:00 +0000 Subject: Disable BFP JIT on ARMv7 as it's currently broken, Remove forced console on aarch64, legacy config (rhbz 1594402) --- diff --git a/configs/fedora/generic/arm/CONFIG_CMDLINE b/configs/fedora/generic/arm/CONFIG_CMDLINE new file mode 100644 index 0000000..f3083e1 --- /dev/null +++ b/configs/fedora/generic/arm/CONFIG_CMDLINE @@ -0,0 +1 @@ +CONFIG_CMDLINE="" diff --git a/configs/fedora/generic/arm/CONFIG_CMDLINE_FORCE b/configs/fedora/generic/arm/CONFIG_CMDLINE_FORCE new file mode 100644 index 0000000..db59f37 --- /dev/null +++ b/configs/fedora/generic/arm/CONFIG_CMDLINE_FORCE @@ -0,0 +1 @@ +# CONFIG_CMDLINE_FORCE is not set diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_CMDLINE b/configs/fedora/generic/arm/aarch64/CONFIG_CMDLINE deleted file mode 100644 index f218410..0000000 --- a/configs/fedora/generic/arm/aarch64/CONFIG_CMDLINE +++ /dev/null @@ -1 +0,0 @@ -CONFIG_CMDLINE="console=ttyAMA0" diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_CMDLINE_FORCE b/configs/fedora/generic/arm/aarch64/CONFIG_CMDLINE_FORCE deleted file mode 100644 index db59f37..0000000 --- a/configs/fedora/generic/arm/aarch64/CONFIG_CMDLINE_FORCE +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_CMDLINE_FORCE is not set 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 0000000..7905dce --- /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 0000000..faae023 --- /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/configs/fedora/generic/arm/armv7/CONFIG_CMDLINE b/configs/fedora/generic/arm/armv7/CONFIG_CMDLINE deleted file mode 100644 index f3083e1..0000000 --- a/configs/fedora/generic/arm/armv7/CONFIG_CMDLINE +++ /dev/null @@ -1 +0,0 @@ -CONFIG_CMDLINE="" diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index af7c0cf..8a6bf51 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 20f01a4..4f87ebc 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 5870c84..df75608 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 20e995b..e736900 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 8b97b58..30bef0e 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 d1ce647..0953680 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 cfd9126..7be0c96 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1840,6 +1840,10 @@ fi # # %changelog +* Mon Jun 25 2018 Peter Robinson +- 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 - 4.18.0-0.rc1.git4.1 - Linux v4.18-rc1-189-g894b8c000ae6