[folded-merged] fs-proc-task_mmu-add-vm_shadow_stack-for-arm64-when-support-gcs-fix.patch removed from -mm tree

[folded-merged] fs-proc-task_mmu-add-vm_shadow_stack-for-arm64-when-support-gcs-fix.patch removed from -mm tree

[Andrew Morton]

The quilt patch titled
     Subject: fs-proc-task_mmu-add-vm_shadow_stack-for-arm64-when-support-gcs-fix
has been removed from the -mm tree.  Its filename was
     fs-proc-task_mmu-add-vm_shadow_stack-for-arm64-when-support-gcs-fix.patch

This patch was dropped because it was folded into fs-proc-task_mmu-add-vm_shadow_stack-for-arm64-when-support-gcs.patch

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: fs-proc-task_mmu-add-vm_shadow_stack-for-arm64-when-support-gcs-fix
Date: Sat Jun  7 02:32:35 PM PDT 2025

simplify ifdeffery

Cc: Andrii Nakryiko <andrii@kernel.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: David Hildenbrand <david@redhat.com>
Cc: Liam Howlett <liam.howlett@oracle.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: wangfushuai <wangfushuai@baidu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 fs/proc/task_mmu.c |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

--- a/fs/proc/task_mmu.c~fs-proc-task_mmu-add-vm_shadow_stack-for-arm64-when-support-gcs-fix
+++ a/fs/proc/task_mmu.c
@@ -991,10 +991,7 @@ static void show_smap_vma_flags(struct s
 #ifdef CONFIG_HAVE_ARCH_USERFAULTFD_MINOR
 		[ilog2(VM_UFFD_MINOR)]	= "ui",
 #endif /* CONFIG_HAVE_ARCH_USERFAULTFD_MINOR */
-#ifdef CONFIG_ARCH_HAS_USER_SHADOW_STACK
-		[ilog2(VM_SHADOW_STACK)] = "ss",
-#endif
-#if defined(CONFIG_ARM64_GCS)
+#if defined(CONFIG_ARCH_HAS_USER_SHADOW_STACK) || defined (CONFIG_ARM64_GCS)
 		[ilog2(VM_SHADOW_STACK)] = "ss",
 #endif
 #if defined(CONFIG_64BIT) || defined(CONFIG_PPC32)
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

docs-proc-update-vmflags-documentation-in-smaps-fix.patch
fs-proc-task_mmu-add-vm_shadow_stack-for-arm64-when-support-gcs.patch
drivers-rapidio-rio_cmc-prevent-possible-used-uninitialized.patch
mm-add-zblock-allocator-fix.patch
mm-add-zblock-allocator-fix-2.patch
mm-add-zblock-allocator-fix-2-fix.patch
mm-add-zblock-allocator-fix-3.patch
mm-zblock-avoid-failing-the-build-fix.patch