Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux.git] / mm / percpu.c

diff --git a/mm/percpu.c b/mm/percpu.c
index 9297098519a6fa793112c3653595c6b509c5fda1..0b6480979ac78147d4a3fe33d8aded2d5e9a1a75 100644 (file)
--- a/mm/percpu.c
+++ b/mm/percpu.c
@@ -2740,11 +2740,7 @@ void __init setup_per_cpu_areas(void)
 
        if (pcpu_setup_first_chunk(ai, fc) < 0)
                panic("Failed to initialize percpu areas.");
-#ifdef CONFIG_CRIS
-#warning "the CRIS architecture has physical and virtual addresses confused"
-#else
        pcpu_free_alloc_info(ai);
-#endif
 }
 
 #endif /* CONFIG_SMP */