~hc/RK356X_SDK_RELEASE.git

..	..	@@ -1,22 +1,11 @@
	1	+/* SPDX-License-Identifier: GPL-2.0-only */
1	2	/*
2	3	* Copyright (C) 2013 ARM Ltd.
3		- *
4		- * This program is free software; you can redistribute it and/or modify
5		- * it under the terms of the GNU General Public License version 2 as
6		- * published by the Free Software Foundation.
7		- *
8		- * This program is distributed in the hope that it will be useful,
9		- * but WITHOUT ANY WARRANTY; without even the implied warranty of
10		- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11		- * GNU General Public License for more details.
12		- *
13		- * You should have received a copy of the GNU General Public License
14		- * along with this program. If not, see <http://www.gnu.org/licenses/>.
15	4	*/
16	5	#ifndef __ASM_STRING_H
17	6	#define __ASM_STRING_H
18	7
19		-#ifndef CONFIG_KASAN
	8	+#if !(defined(CONFIG_KASAN_GENERIC) \|\| defined(CONFIG_KASAN_SW_TAGS))
20	9	#define __HAVE_ARCH_STRRCHR
21	10	extern char strrchr(const char , int c);
22	11
..	..	@@ -59,7 +48,8 @@
59	48	void memcpy_flushcache(void dst, const void src, size_t cnt);
60	49	#endif
61	50
62		-#if defined(CONFIG_KASAN) && !defined(__SANITIZE_ADDRESS__)
	51	+#if (defined(CONFIG_KASAN_GENERIC) \|\| defined(CONFIG_KASAN_SW_TAGS)) && \
	52	+ !defined(__SANITIZE_ADDRESS__)
63	53
64	54	/*
65	55	* For files that are not instrumented (e.g. mm/slub.c) we