hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/arch/microblaze/kernel/setup.c
....@@ -18,6 +18,7 @@
1818 #include <linux/console.h>
1919 #include <linux/debugfs.h>
2020 #include <linux/of_fdt.h>
21
+#include <linux/pgtable.h>
2122
2223 #include <asm/setup.h>
2324 #include <asm/sections.h>
....@@ -33,7 +34,6 @@
3334 #include <asm/entry.h>
3435 #include <asm/cpuinfo.h>
3536
36
-#include <asm/pgtable.h>
3737
3838 DEFINE_PER_CPU(unsigned int, KSP); /* Saved kernel stack pointer */
3939 DEFINE_PER_CPU(unsigned int, KM); /* Kernel/user mode */
....@@ -41,20 +41,18 @@
4141 DEFINE_PER_CPU(unsigned int, R11_SAVE); /* Temp variable for entry */
4242 DEFINE_PER_CPU(unsigned int, CURRENT_SAVE); /* Saved current pointer */
4343
44
-unsigned int boot_cpuid;
4544 /*
4645 * Placed cmd_line to .data section because can be initialized from
4746 * ASM code. Default position is BSS section which is cleared
4847 * in machine_early_init().
4948 */
50
-char cmd_line[COMMAND_LINE_SIZE] __attribute__ ((section(".data")));
49
+char cmd_line[COMMAND_LINE_SIZE] __section(".data");
5150
5251 void __init setup_arch(char **cmdline_p)
5352 {
5453 *cmdline_p = boot_command_line;
5554
5655 setup_memory();
57
- parse_early_param();
5856
5957 console_verbose();
6058
....@@ -65,10 +63,6 @@
6563 microblaze_cache_init();
6664
6765 xilinx_pci_init();
68
-
69
-#if defined(CONFIG_DUMMY_CONSOLE)
70
- conswitchp = &dummy_con;
71
-#endif
7266 }
7367
7468 #ifdef CONFIG_MTD_UCLINUX
....@@ -192,23 +186,14 @@
192186 static int microblaze_debugfs_init(void)
193187 {
194188 of_debugfs_root = debugfs_create_dir("microblaze", NULL);
195
-
196
- return of_debugfs_root == NULL;
189
+ return 0;
197190 }
198191 arch_initcall(microblaze_debugfs_init);
199192
200193 # ifdef CONFIG_MMU
201194 static int __init debugfs_tlb(void)
202195 {
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);
212197 return 0;
213198 }
214199 device_initcall(debugfs_tlb);