Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora

5 files changed, 37 insertions, 2 deletions

diff --git a/aarch64build.patch b/aarch64build.patch
new file mode 100644
index 000000000..a26e647ac
--- /dev/null
+++ b/aarch64build.patch
@@ -0,0 +1,17 @@
+---
+ kernel/irq/manage.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
+index ab8567f32501..dec3f73e8db9 100644
+--- a/kernel/irq/manage.c
++++ b/kernel/irq/manage.c
+@@ -2859,3 +2859,4 @@ bool irq_check_status_bit(unsigned int irq, unsigned int bitmask)
+ 	rcu_read_unlock();
+ 	return res;
+ }
++EXPORT_SYMBOL_GPL(irq_check_status_bit);
+-- 
+2.27.0
+
+  
\ No newline at end of file
diff --git a/gcc11-plugins-fix.patch b/gcc11-plugins-fix.patch
new file mode 100644
index 000000000..caac69117
--- /dev/null
+++ b/gcc11-plugins-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/scripts/gcc-plugins/Makefile b/scripts/gcc-plugins/Makefile
+index d66949bfeba4..a6c35d651704 100644
+--- a/scripts/gcc-plugins/Makefile
++++ b/scripts/gcc-plugins/Makefile
+@@ -22,7 +22,7 @@ always-y += $(GCC_PLUGIN)
+ GCC_PLUGINS_DIR = $(shell $(CC) -print-file-name=plugin)
+
+ plugin_cxxflags	= -Wp,-MMD,$(depfile) $(KBUILD_HOSTCXXFLAGS) -fPIC \
+-		   -I $(GCC_PLUGINS_DIR)/include -I $(obj) -std=gnu++98 \
++		   -I $(GCC_PLUGINS_DIR)/include -I $(obj) -std=gnu++11 \
+ 		   -fno-rtti -fno-exceptions -fasynchronous-unwind-tables \
+ 		   -ggdb -Wno-narrowing -Wno-unused-variable -Wno-c++11-compat \
+ 		   -Wno-format-diag
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 2a33d82bb..83fc4b61f 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -3269,7 +3269,7 @@ CONFIG_KALLSYMS_ALL=y
 CONFIG_KALLSYMS=y
 CONFIG_KARMA_PARTITION=y
 CONFIG_KASAN_GENERIC=y
-CONFIG_KASAN_HW_TAGS=y
+# CONFIG_KASAN_HW_TAGS is not set
 CONFIG_KASAN_INLINE=y
 # CONFIG_KASAN_OUTLINE is not set
 # CONFIG_KASAN_SW_TAGS is not set
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 68567baed..0c3358348 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -2599,7 +2599,7 @@ CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_KALLSYMS=y
 # CONFIG_KARMA_PARTITION is not set
 CONFIG_KASAN_GENERIC=y
-CONFIG_KASAN_HW_TAGS=y
+# CONFIG_KASAN_HW_TAGS is not set
 CONFIG_KASAN_INLINE=y
 # CONFIG_KASAN_OUTLINE is not set
 # CONFIG_KASAN_SW_TAGS is not set
diff --git a/kernel.spec b/kernel.spec
index f9adc5692..733fa5577 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -381,6 +381,7 @@ Summary: The Linux kernel
 %define make_target vmlinux
 %define kernel_image vmlinux
 %define kernel_image_elf 1
+%define use_vdso 0
 %define all_arch_configs kernel-%{version}-ppc64le*.config
 %endif
 
@@ -744,6 +745,8 @@ Source4000: README.rst
 
 Patch1: patch-%{rpmversion}-redhat.patch
 Patch2: secureboot_merge_fix.patch
+Patch3: gcc11-plugins-fix.patch
+Patch4: aarch64build.patch
 %endif
 
 # empty final patch to facilitate testing of kernel patches
@@ -1248,6 +1251,8 @@ cd linux-%{KVERREL}
 
 ApplyOptionalPatch patch-%{rpmversion}-redhat.patch
 ApplyOptionalPatch secureboot_merge_fix.patch
+ApplyOptionalPatch gcc11-plugins-fix.patch
+ApplyOptionalPatch aarch64build.patch
 %endif
 
 ApplyOptionalPatch linux-kernel-test.patch