.. | .. |
---|
34 | 34 | #include <linux/kdebug.h> |
---|
35 | 35 | #include <linux/export.h> |
---|
36 | 36 | #include <linux/start_kernel.h> |
---|
| 37 | +#include <uapi/linux/mount.h> |
---|
37 | 38 | |
---|
38 | 39 | #include <asm/io.h> |
---|
39 | 40 | #include <asm/processor.h> |
---|
40 | 41 | #include <asm/oplib.h> |
---|
41 | 42 | #include <asm/page.h> |
---|
42 | | -#include <asm/pgtable.h> |
---|
43 | 43 | #include <asm/traps.h> |
---|
44 | 44 | #include <asm/vaddrs.h> |
---|
45 | 45 | #include <asm/mbus.h> |
---|
.. | .. |
---|
310 | 310 | |
---|
311 | 311 | register_console(&prom_early_console); |
---|
312 | 312 | |
---|
313 | | - printk("ARCH: "); |
---|
314 | 313 | switch(sparc_cpu_model) { |
---|
315 | 314 | case sun4m: |
---|
316 | | - printk("SUN4M\n"); |
---|
| 315 | + pr_info("ARCH: SUN4M\n"); |
---|
317 | 316 | break; |
---|
318 | 317 | case sun4d: |
---|
319 | | - printk("SUN4D\n"); |
---|
| 318 | + pr_info("ARCH: SUN4D\n"); |
---|
320 | 319 | break; |
---|
321 | 320 | case sun4e: |
---|
322 | | - printk("SUN4E\n"); |
---|
| 321 | + pr_info("ARCH: SUN4E\n"); |
---|
323 | 322 | break; |
---|
324 | 323 | case sun4u: |
---|
325 | | - printk("SUN4U\n"); |
---|
| 324 | + pr_info("ARCH: SUN4U\n"); |
---|
326 | 325 | break; |
---|
327 | 326 | case sparc_leon: |
---|
328 | | - printk("LEON\n"); |
---|
| 327 | + pr_info("ARCH: LEON\n"); |
---|
329 | 328 | break; |
---|
330 | 329 | default: |
---|
331 | | - printk("UNKNOWN!\n"); |
---|
| 330 | + pr_info("ARCH: UNKNOWN!\n"); |
---|
332 | 331 | break; |
---|
333 | 332 | } |
---|
334 | | - |
---|
335 | | -#ifdef CONFIG_DUMMY_CONSOLE |
---|
336 | | - conswitchp = &dummy_con; |
---|
337 | | -#endif |
---|
338 | 333 | |
---|
339 | 334 | idprom_init(); |
---|
340 | 335 | load_mmu(); |
---|
.. | .. |
---|
358 | 353 | ROOT_DEV = old_decode_dev(root_dev); |
---|
359 | 354 | #ifdef CONFIG_BLK_DEV_RAM |
---|
360 | 355 | 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); |
---|
363 | 356 | #endif |
---|
364 | 357 | |
---|
365 | 358 | prom_setsync(prom_sync_me); |
---|
.. | .. |
---|
422 | 415 | } |
---|
423 | 416 | |
---|
424 | 417 | 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 |
---|