mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/arch/arm/lib/copy_from_user.S
..
..
@@ -1,13 +1,10 @@
1
+/* SPDX-License-Identifier: GPL-2.0-only */
1
2
 /*
2
3
  *  linux/arch/arm/lib/copy_from_user.S
3
4
  *
4
5
  *  Author:	Nicolas Pitre
5
6
  *  Created:	Sep 29, 2005
6
7
  *  Copyright:	MontaVista Software, Inc.
7
- *
8
- *  This program is free software; you can redistribute it and/or modify
9
- *  it under the terms of the GNU General Public License version 2 as
10
- *  published by the Free Software Foundation.
11
8
  */
12
9
 
13
10
 #include <linux/linkage.h>
..
..
@@ -34,12 +31,13 @@
34
31
  *	Number of bytes NOT copied.
35
32
  */
36
33
 
34
+#ifdef CONFIG_CPU_USE_DOMAINS
35
+
37
36
 #ifndef CONFIG_THUMB2_KERNEL
38
37
 #define LDR1W_SHIFT	0
39
38
 #else
40
39
 #define LDR1W_SHIFT	1
41
40
 #endif
42
-#define STR1W_SHIFT	0
43
41
 
44
42
 	.macro ldr1w ptr reg abort
45
43
 	ldrusr	\reg, \ptr, 4, abort=\abort
..
..
@@ -57,9 +55,29 @@
57
55
 	ldr4w \ptr, \reg5, \reg6, \reg7, \reg8, \abort
58
56
 	.endm
59
57
 
58
+#else
59
+
60
+#define LDR1W_SHIFT	0
61
+
62
+	.macro ldr1w ptr reg abort
63
+	USERL(\abort, W(ldr) \reg, [\ptr], #4)
64
+	.endm
65
+
66
+	.macro ldr4w ptr reg1 reg2 reg3 reg4 abort
67
+	USERL(\abort, ldmia \ptr!, {\reg1, \reg2, \reg3, \reg4})
68
+	.endm
69
+
70
+	.macro ldr8w ptr reg1 reg2 reg3 reg4 reg5 reg6 reg7 reg8 abort
71
+	USERL(\abort, ldmia \ptr!, {\reg1, \reg2, \reg3, \reg4, \reg5, \reg6, \reg7, \reg8})
72
+	.endm
73
+
74
+#endif /* CONFIG_CPU_USE_DOMAINS */
75
+
60
76
 	.macro ldr1b ptr reg cond=al abort
61
77
 	ldrusr	\reg, \ptr, 1, \cond, abort=\abort
62
78
 	.endm
79
+
80
+#define STR1W_SHIFT	0
63
81
 
64
82
 	.macro str1w ptr reg abort
65
83
 	W(str) \reg, [\ptr], #4
..
..
@@ -70,7 +88,7 @@
70
88
 	.endm
71
89
 
72
90
 	.macro str1b ptr reg cond=al abort
73
-	str\cond\()b \reg, [\ptr], #1
91
+	strb\cond \reg, [\ptr], #1
74
92
 	.endm
75
93
 
76
94
 	.macro enter reg1 reg2