mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/arch/microblaze/kernel/setup.c
..
..
@@ -18,6 +18,7 @@
18
18
 #include <linux/console.h>
19
19
 #include <linux/debugfs.h>
20
20
 #include <linux/of_fdt.h>
21
+#include <linux/pgtable.h>
21
22
 
22
23
 #include <asm/setup.h>
23
24
 #include <asm/sections.h>
..
..
@@ -33,7 +34,6 @@
33
34
 #include <asm/entry.h>
34
35
 #include <asm/cpuinfo.h>
35
36
 
36
-#include <asm/pgtable.h>
37
37
 
38
38
 DEFINE_PER_CPU(unsigned int, KSP);	/* Saved kernel stack pointer */
39
39
 DEFINE_PER_CPU(unsigned int, KM);	/* Kernel/user mode */
..
..
@@ -41,20 +41,18 @@
41
41
 DEFINE_PER_CPU(unsigned int, R11_SAVE);	/* Temp variable for entry */
42
42
 DEFINE_PER_CPU(unsigned int, CURRENT_SAVE);	/* Saved current pointer */
43
43
 
44
-unsigned int boot_cpuid;
45
44
 /*
46
45
  * Placed cmd_line to .data section because can be initialized from
47
46
  * ASM code. Default position is BSS section which is cleared
48
47
  * in machine_early_init().
49
48
  */
50
-char cmd_line[COMMAND_LINE_SIZE] __attribute__ ((section(".data")));
49
+char cmd_line[COMMAND_LINE_SIZE] __section(".data");
51
50
 
52
51
 void __init setup_arch(char **cmdline_p)
53
52
 {
54
53
 	*cmdline_p = boot_command_line;
55
54
 
56
55
 	setup_memory();
57
-	parse_early_param();
58
56
 
59
57
 	console_verbose();
60
58
 
..
..
@@ -65,10 +63,6 @@
65
63
 	microblaze_cache_init();
66
64
 
67
65
 	xilinx_pci_init();
68
-
69
-#if defined(CONFIG_DUMMY_CONSOLE)
70
-	conswitchp = &dummy_con;
71
-#endif
72
66
 }
73
67
 
74
68
 #ifdef CONFIG_MTD_UCLINUX
..
..
@@ -192,23 +186,14 @@
192
186
 static int microblaze_debugfs_init(void)
193
187
 {
194
188
 	of_debugfs_root = debugfs_create_dir("microblaze", NULL);
195
-
196
-	return of_debugfs_root == NULL;
189
+	return 0;
197
190
 }
198
191
 arch_initcall(microblaze_debugfs_init);
199
192
 
200
193
 # ifdef CONFIG_MMU
201
194
 static int __init debugfs_tlb(void)
202
195
 {
203
-	struct dentry *d;
204
-
205
-	if (!of_debugfs_root)
206
-		return -ENODEV;
207
-
208
-	d = debugfs_create_u32("tlb_skip", S_IRUGO, of_debugfs_root, &tlb_skip);
209
-	if (!d)
210
-		return -ENOMEM;
211
-
196
+	debugfs_create_u32("tlb_skip", S_IRUGO, of_debugfs_root, &tlb_skip);
212
197
 	return 0;
213
198
 }
214
199
 device_initcall(debugfs_tlb);