replace our downstream version of the patches with the ones that were sent upstream. Signed-off-by: John Crispin <john@phrozen.org>
		
			
				
	
	
		
			43 lines
		
	
	
		
			1.2 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			43 lines
		
	
	
		
			1.2 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
From 30dc99e95ac4410072850ae466f696cb56097bb4 Mon Sep 17 00:00:00 2001
 | 
						|
From: Felix Fietkau <nbd@nbd.name>
 | 
						|
Date: Mon, 5 Mar 2018 11:35:29 +0100
 | 
						|
Subject: [PATCH 14/33] MIPS: ath79: finetune cpu-overrides
 | 
						|
 | 
						|
This patch adds a few additional cpu feature overrides so that they do not
 | 
						|
need to be probed at runtime.
 | 
						|
 | 
						|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
 | 
						|
Signed-off-by: John Crispin <john@phrozen.org>
 | 
						|
---
 | 
						|
 arch/mips/include/asm/mach-ath79/cpu-feature-overrides.h | 6 ++++++
 | 
						|
 1 file changed, 6 insertions(+)
 | 
						|
 | 
						|
--- a/arch/mips/include/asm/mach-ath79/cpu-feature-overrides.h
 | 
						|
+++ b/arch/mips/include/asm/mach-ath79/cpu-feature-overrides.h
 | 
						|
@@ -36,6 +36,7 @@
 | 
						|
 #define cpu_has_mdmx		0
 | 
						|
 #define cpu_has_mips3d		0
 | 
						|
 #define cpu_has_smartmips	0
 | 
						|
+#define cpu_has_rixi		0
 | 
						|
 
 | 
						|
 #define cpu_has_mips32r1	1
 | 
						|
 #define cpu_has_mips32r2	1
 | 
						|
@@ -43,6 +44,7 @@
 | 
						|
 #define cpu_has_mips64r2	0
 | 
						|
 
 | 
						|
 #define cpu_has_mipsmt		0
 | 
						|
+#define cpu_has_userlocal	0
 | 
						|
 
 | 
						|
 #define cpu_has_64bits		0
 | 
						|
 #define cpu_has_64bit_zero_reg	0
 | 
						|
@@ -51,5 +53,9 @@
 | 
						|
 
 | 
						|
 #define cpu_dcache_line_size()	32
 | 
						|
 #define cpu_icache_line_size()	32
 | 
						|
+#define cpu_has_vtag_icache	0
 | 
						|
+#define cpu_has_dc_aliases	1
 | 
						|
+#define cpu_has_ic_fills_f_dc	0
 | 
						|
+#define cpu_has_pindexed_dcache	0
 | 
						|
 
 | 
						|
 #endif /* __ASM_MACH_ATH79_CPU_FEATURE_OVERRIDES_H */
 |