移去rt

hc

2023-12-08 01573e231f18eb2d99162747186f59511f56b64d

 kernel/arch/x86/kernel/machine_kexec_32.c
..
..
@@ -1,9 +1,7 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * handle transition of Linux booting another kernel
3
4
  * Copyright (C) 2002-2005 Eric Biederman  <ebiederm@xmission.com>
4
- *
5
- * This source code is licensed under the GNU General Public License,
6
- * Version 2.  See the file COPYING for more details.
7
5
  */
8
6
 
9
7
 #include <linux/mm.h>
..
..
@@ -15,7 +13,6 @@
15
13
 #include <linux/gfp.h>
16
14
 #include <linux/io.h>
17
15
 
18
-#include <asm/pgtable.h>
19
16
 #include <asm/pgalloc.h>
20
17
 #include <asm/tlbflush.h>
21
18
 #include <asm/mmu_context.h>
..
..
@@ -150,7 +147,7 @@
150
147
 {
151
148
 	int error;
152
149
 
153
-	set_pages_x(image->control_code_page, 1);
150
+	set_memory_x((unsigned long)page_address(image->control_code_page), 1);
154
151
 	error = machine_kexec_alloc_page_tables(image);
155
152
 	if (error)
156
153
 		return error;
..
..
@@ -164,7 +161,7 @@
164
161
  */
165
162
 void machine_kexec_cleanup(struct kimage *image)
166
163
 {
167
-	set_pages_nx(image->control_code_page, 1);
164
+	set_memory_nx((unsigned long)page_address(image->control_code_page), 1);
168
165
 	machine_kexec_free_page_tables(image);
169
166
 }
170
167
 
..
..
@@ -252,15 +249,3 @@
252
249
 
253
250
 	__ftrace_enabled_restore(save_ftrace_enabled);
254
251
 }
255
-
256
-void arch_crash_save_vmcoreinfo(void)
257
-{
258
-#ifdef CONFIG_NUMA
259
-	VMCOREINFO_SYMBOL(node_data);
260
-	VMCOREINFO_LENGTH(node_data, MAX_NUMNODES);
261
-#endif
262
-#ifdef CONFIG_X86_PAE
263
-	VMCOREINFO_CONFIG(X86_PAE);
264
-#endif
265
-}
266
-