hc
2024-05-10 748e4f3d702def1a4bff191e0cf93b6a05340f01
kernel/arch/sparc/kernel/setup_32.c
....@@ -34,12 +34,12 @@
3434 #include <linux/kdebug.h>
3535 #include <linux/export.h>
3636 #include <linux/start_kernel.h>
37
+#include <uapi/linux/mount.h>
3738
3839 #include <asm/io.h>
3940 #include <asm/processor.h>
4041 #include <asm/oplib.h>
4142 #include <asm/page.h>
42
-#include <asm/pgtable.h>
4343 #include <asm/traps.h>
4444 #include <asm/vaddrs.h>
4545 #include <asm/mbus.h>
....@@ -310,31 +310,26 @@
310310
311311 register_console(&prom_early_console);
312312
313
- printk("ARCH: ");
314313 switch(sparc_cpu_model) {
315314 case sun4m:
316
- printk("SUN4M\n");
315
+ pr_info("ARCH: SUN4M\n");
317316 break;
318317 case sun4d:
319
- printk("SUN4D\n");
318
+ pr_info("ARCH: SUN4D\n");
320319 break;
321320 case sun4e:
322
- printk("SUN4E\n");
321
+ pr_info("ARCH: SUN4E\n");
323322 break;
324323 case sun4u:
325
- printk("SUN4U\n");
324
+ pr_info("ARCH: SUN4U\n");
326325 break;
327326 case sparc_leon:
328
- printk("LEON\n");
327
+ pr_info("ARCH: LEON\n");
329328 break;
330329 default:
331
- printk("UNKNOWN!\n");
330
+ pr_info("ARCH: UNKNOWN!\n");
332331 break;
333332 }
334
-
335
-#ifdef CONFIG_DUMMY_CONSOLE
336
- conswitchp = &dummy_con;
337
-#endif
338333
339334 idprom_init();
340335 load_mmu();
....@@ -358,8 +353,6 @@
358353 ROOT_DEV = old_decode_dev(root_dev);
359354 #ifdef CONFIG_BLK_DEV_RAM
360355 rd_image_start = ram_flags & RAMDISK_IMAGE_START_MASK;
361
- rd_prompt = ((ram_flags & RAMDISK_PROMPT_FLAG) != 0);
362
- rd_doload = ((ram_flags & RAMDISK_LOAD_FLAG) != 0);
363356 #endif
364357
365358 prom_setsync(prom_sync_me);
....@@ -422,3 +415,10 @@
422415 }
423416
424417 subsys_initcall(topology_init);
418
+
419
+#if defined(CONFIG_SPARC32) && !defined(CONFIG_SMP)
420
+void __init arch_cpu_finalize_init(void)
421
+{
422
+ cpu_data(0).udelay_val = loops_per_jiffy;
423
+}
424
+#endif