From d06271af9519f1ae0b87b0c1d8c1d688c6e8f13d Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Mon, 2 Apr 2012 12:50:54 +0200 Subject: [PATCH] --- yaml --- r: 298503 b: refs/heads/master c: 0fc7374bb5df938ef3d386e48ac9797d7651e9cc h: refs/heads/master i: 298501: 43d484dd0897536ed87d7440f399cd218e9ad692 298499: 50cea3fd23b53570f47949298035eae411eb7a26 298495: 68b29a18d9dfc1388252fefb15ebcb6b59487ce4 v: v3 --- [refs] | 2 +- trunk/arch/microblaze/kernel/early_printk.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 2099002d8e61..996987307907 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 90c0d80daa82fa9cbaa85d1a787375b33877d2d4 +refs/heads/master: 0fc7374bb5df938ef3d386e48ac9797d7651e9cc diff --git a/trunk/arch/microblaze/kernel/early_printk.c b/trunk/arch/microblaze/kernel/early_printk.c index ec485876d0d0..aba1f9a97d5d 100644 --- a/trunk/arch/microblaze/kernel/early_printk.c +++ b/trunk/arch/microblaze/kernel/early_printk.c @@ -176,6 +176,7 @@ void __init remap_early_printk(void) base_addr = (u32) ioremap(base_addr, PAGE_SIZE); printk(KERN_CONT "0x%x\n", base_addr); +#ifdef CONFIG_MMU /* * Early console is on the top of skipped TLB entries * decrease tlb_skip size ensure that hardcoded TLB entry will be @@ -189,6 +190,7 @@ void __init remap_early_printk(void) * cmp rX, orig_base_addr */ tlb_skip -= 1; +#endif } void __init disable_early_printk(void)