forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2024-05-13 9d77db3c730780c8ef5ccd4b66403ff5675cfe4e 
 kernel/arch/arm/mm/proc-arm1026.S
....@@ -1,3 +1,4 @@
1
+/* SPDX-License-Identifier: GPL-2.0-or-later */
12 /*
23  *  linux/arch/arm/mm/proc-arm1026.S: MMU functions for ARM1026EJ-S
34  *
....@@ -5,22 +6,16 @@
56  *  Copyright (C) 2000 Deep Blue Solutions Ltd.
67  *  hacked for non-paged-MM by Hyok S. Choi, 2003.
78  *
8
- * This program is free software; you can redistribute it and/or modify
9
- * it under the terms of the GNU General Public License as published by
10
- * the Free Software Foundation; either version 2 of the License, or
11
- * (at your option) any later version.
12
- *
13
- *
149  * These are the low level assembler for performing cache and TLB
1510  * functions on the ARM1026EJ-S.
1611  */
1712 #include <linux/linkage.h>
1813 #include <linux/init.h>
14
+#include <linux/pgtable.h>
1915 #include <asm/assembler.h>
2016 #include <asm/asm-offsets.h>
2117 #include <asm/hwcap.h>
2218 #include <asm/pgtable-hwdef.h>
23
-#include <asm/pgtable.h>
2419 #include <asm/ptrace.h>
2520 
2621 #include "proc-macros.S"
....@@ -143,7 +138,7 @@
143138 	mov	ip, #0
144139 __flush_whole_cache:
145140 #ifndef CONFIG_CPU_DCACHE_DISABLE
146
-1:	mrc	p15, 0, r15, c7, c14, 3		@ test, clean, invalidate
141
+1:	mrc	p15, 0, APSR_nzcv, c7, c14, 3		@ test, clean, invalidate
147142 	bne	1b
148143 #endif
149144 	tst	r2, #VM_EXEC
....@@ -368,7 +363,7 @@
368363 #ifdef CONFIG_MMU
369364 	mov	r1, #0
370365 #ifndef CONFIG_CPU_DCACHE_DISABLE
371
-1:	mrc	p15, 0, r15, c7, c14, 3		@ test, clean, invalidate
366
+1:	mrc	p15, 0, APSR_nzcv, c7, c14, 3		@ test, clean, invalidate
372367 	bne	1b
373368 #endif
374369 #ifndef CONFIG_CPU_ICACHE_DISABLE
....@@ -442,7 +437,7 @@
442437 	string	cpu_arm1026_name, "ARM1026EJ-S"
443438 	.align
444439 
445
-	.section ".proc.info.init", #alloc
440
+	.section ".proc.info.init", "a"
446441 
447442 	.type	__arm1026_proc_info,#object
448443 __arm1026_proc_info: