auto-patch: update auto-patch. [1/1]

PD#SWPL-101774

Problem:
Version updates cause compilation errors.

Solution:
update auto-patch.

Verify:
sc2

Change-Id: Iac0c445169261e21cc679e0f742818a2ea582fef
Signed-off-by: qiankun.wang <qiankun.wang@amlogic.com>
This commit is contained in:
qiankun.wang
2023-11-21 10:33:43 +08:00
committed by gerrit autosubmit
parent 43bed5050a
commit eb8a845bb9
@@ -1,4 +1,4 @@
From d11b4ee85157903d2aeba01112d8a093674c87a0 Mon Sep 17 00:00:00 2001
From c745ee3b1da734e50d503c02afbfabacf97612e1 Mon Sep 17 00:00:00 2001
From: "qiankun.wang" <qiankun.wang@amlogic.com>
Date: Fri, 25 Aug 2023 12:48:23 +0800
Subject: [PATCH] ARM: stacktrace: filter irq stacks. [1/1]
@@ -22,8 +22,8 @@ Change-Id: Ib99f366955a051cb439ee9f86dfe2c667288d2d0
Signed-off-by: qiankun.wang <qiankun.wang@amlogic.com>
---
arch/arm/include/asm/exception.h | 4 ++++
mm/kasan/kasan.h | 6 ++++++
2 files changed, 10 insertions(+)
mm/kasan/kasan.h | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/arch/arm/include/asm/exception.h b/arch/arm/include/asm/exception.h
index 58e039a851af..c56ab8bb419a 100644
@@ -45,22 +45,21 @@ index 58e039a851af..c56ab8bb419a 100644
#endif /* __ASM_ARM_EXCEPTION_H */
diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h
index 47da190423d4..ec8d244f3c64 100644
index 47da190423d4..302d6a8d87f3 100644
--- a/mm/kasan/kasan.h
+++ b/mm/kasan/kasan.h
@@ -245,6 +245,12 @@ struct kasan_global {
/* Structures for keeping alloc and free meta. */
@@ -188,7 +188,11 @@ static inline bool kasan_requires_meta(void)
#define META_MEM_BYTES_PER_ROW (META_BYTES_PER_ROW * KASAN_GRANULE_SIZE)
#define META_ROWS_AROUND_ADDR 2
+#ifdef CONFIG_AMLOGIC_ARM_KASAN
+#define KASAN_STACK_DEPTH 32
+#else
+#define KASAN_STACK_DEPTH 64
#define KASAN_STACK_DEPTH 64
+#endif
+
#ifdef CONFIG_KASAN_GENERIC
struct kasan_alloc_meta {
struct kasan_track {
u32 pid;
--
2.25.1
2.42.0