diff options
| author | Michal Simek <monstr@monstr.eu> | 2009-07-30 14:31:23 +0200 |
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2009-09-21 14:29:21 +0200 |
| commit | 2622434ee0108c65808a63f067e72d0bbc75b372 (patch) | |
| tree | c6f89cd62d636bbdc6e96c589481d79b7b67c3da /arch/microblaze/kernel/setup.c | |
| parent | 8cc11f5ab5384dad6c63905f71882e65cd70b7b7 (diff) | |
| download | talos-op-linux-2622434ee0108c65808a63f067e72d0bbc75b372.tar.gz talos-op-linux-2622434ee0108c65808a63f067e72d0bbc75b372.zip | |
microblaze: Add checking mechanism for MSR instruction
It was necessary to use fourth parameter(r8) in early_printk
to show messages on console.
Signed-off-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch/microblaze/kernel/setup.c')
| -rw-r--r-- | arch/microblaze/kernel/setup.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/arch/microblaze/kernel/setup.c b/arch/microblaze/kernel/setup.c index 2a97bf513b64..8c1e0f4dcf18 100644 --- a/arch/microblaze/kernel/setup.c +++ b/arch/microblaze/kernel/setup.c @@ -94,7 +94,7 @@ inline unsigned get_romfs_len(unsigned *addr) #endif /* CONFIG_MTD_UCLINUX_EBSS */ void __init machine_early_init(const char *cmdline, unsigned int ram, - unsigned int fdt) + unsigned int fdt, unsigned int msr) { unsigned long *src, *dst = (unsigned long *)0x0; @@ -157,6 +157,16 @@ void __init machine_early_init(const char *cmdline, unsigned int ram, early_printk("New klimit: 0x%08x\n", (unsigned)klimit); #endif +#if CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR + if (msr) + early_printk("!!!Your kernel has setup MSR instruction but " + "CPU don't have it %d\n", msr); +#else + if (!msr) + early_printk("!!!Your kernel not setup MSR instruction but " + "CPU have it %d\n", msr); +#endif + for (src = __ivt_start; src < __ivt_end; src++, dst++) *dst = *src; |
