kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/arch/powerpc/include/asm/sections.h
..
..
@@ -5,7 +5,21 @@
5
5
 
6
6
 #include <linux/elf.h>
7
7
 #include <linux/uaccess.h>
8
+
9
+#define arch_is_kernel_initmem_freed arch_is_kernel_initmem_freed
10
+
8
11
 #include <asm-generic/sections.h>
12
+
13
+extern bool init_mem_is_free;
14
+
15
+static inline int arch_is_kernel_initmem_freed(unsigned long addr)
16
+{
17
+	if (!init_mem_is_free)
18
+		return 0;
19
+
20
+	return addr >= (unsigned long)__init_begin &&
21
+		addr < (unsigned long)__init_end;
22
+}
9
23
 
10
24
 extern char __head_end[];
11
25
 
..
..
@@ -16,6 +30,13 @@
16
30
 
17
31
 extern char __prom_init_toc_start[];
18
32
 extern char __prom_init_toc_end[];
33
+
34
+#ifdef CONFIG_PPC_POWERNV
35
+extern char start_real_trampolines[];
36
+extern char end_real_trampolines[];
37
+extern char start_virt_trampolines[];
38
+extern char end_virt_trampolines[];
39
+#endif
19
40
 
20
41
 static inline int in_kernel_text(unsigned long addr)
21
42
 {
..
..
@@ -54,17 +75,6 @@
54
75
 		(unsigned long)_stext < end;
55
76
 }
56
77
 
57
-static inline int overlaps_kvm_tmp(unsigned long start, unsigned long end)
58
-{
59
-#ifdef CONFIG_KVM_GUEST
60
-	extern char kvm_tmp[];
61
-	return start < (unsigned long)kvm_tmp &&
62
-		(unsigned long)&kvm_tmp[1024 * 1024] < end;
63
-#else
64
-	return 0;
65
-#endif
66
-}
67
-
68
78
 #ifdef PPC64_ELF_ABI_v1
69
79
 
70
80
 #define HAVE_DEREFERENCE_FUNCTION_DESCRIPTOR 1
..
..
@@ -75,7 +85,7 @@
75
85
 	struct ppc64_opd_entry *desc = ptr;
76
86
 	void *p;
77
87
 
78
-	if (!probe_kernel_address(&desc->funcaddr, p))
88
+	if (!get_kernel_nofault(p, (void *)&desc->funcaddr))
79
89
 		ptr = p;
80
90
 	return ptr;
81
91
 }