Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd

[pandora-kernel.git] / arch / microblaze / mm / init.c

diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c
index c843786..36a133e 100644 (file)
--- a/arch/microblaze/mm/init.c
+++ b/arch/microblaze/mm/init.c
@@ -32,8 +32,6 @@ unsigned int __page_offset;
 EXPORT_SYMBOL(__page_offset);
 
 #else
-DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
-
 static int init_bootmem_done;
 #endif /* CONFIG_MMU */
 
@@ -306,11 +304,11 @@ asmlinkage void __init mmu_init(void)
        /* Map in all of RAM starting at CONFIG_KERNEL_START */
        mapin_ram();
 
-#ifdef HIGHMEM_START_BOOL
-       ioremap_base = HIGHMEM_START;
+#ifdef CONFIG_HIGHMEM_START_BOOL
+       ioremap_base = CONFIG_HIGHMEM_START;
 #else
        ioremap_base = 0xfe000000UL;    /* for now, could be 0xfffff000 */
-#endif /* CONFIG_HIGHMEM */
+#endif /* CONFIG_HIGHMEM_START_BOOL */
        ioremap_bot = ioremap_base;
 
        /* Initialize the context management stuff */