diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-11 16:13:53 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-11 16:13:53 -0800 |
| commit | a288465fa86731108c0ee590da505abe65480473 (patch) | |
| tree | fb3ea0025fa4084dc7a5762a783f635affe39d5e /arch/microblaze/kernel/setup.c | |
| parent | 80d02d273641d515269c016d9e8da5882e4432e4 (diff) | |
| parent | 0eb6aaf52965c14ba3ea245448c4806cfcd1d18c (diff) | |
| download | lwn-a288465fa86731108c0ee590da505abe65480473.tar.gz lwn-a288465fa86731108c0ee590da505abe65480473.zip | |
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
* 'next' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: Fix msr instruction detection
microblaze: Fix pte_update function
microblaze: Fix asm compilation warning
microblaze: Fix IRQ flag handling for MSR=0
Diffstat (limited to 'arch/microblaze/kernel/setup.c')
| -rw-r--r-- | arch/microblaze/kernel/setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/microblaze/kernel/setup.c b/arch/microblaze/kernel/setup.c index bb1558e4b283..9312fbb37efd 100644 --- a/arch/microblaze/kernel/setup.c +++ b/arch/microblaze/kernel/setup.c @@ -161,11 +161,11 @@ void __init machine_early_init(const char *cmdline, unsigned int ram, #if CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR if (msr) eprintk("!!!Your kernel has setup MSR instruction but " - "CPU don't have it %d\n", msr); + "CPU don't have it %x\n", msr); #else if (!msr) eprintk("!!!Your kernel not setup MSR instruction but " - "CPU have it %d\n", msr); + "CPU have it %x\n", msr); #endif for (src = __ivt_start; src < __ivt_end; src++, dst++) |