Merge branch 'akpm' (updates from Andrew Morton)

[~andy/linux] / arch / ia64 / mm / discontig.c

diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c
index 58550b8f7d40a6e8d361a1062d4eb5379a69e41b..2de08f4d99305fa42aafe573da4cbbd5ad3892ca 100644 (file)
--- a/arch/ia64/mm/discontig.c
+++ b/arch/ia64/mm/discontig.c
@@ -592,7 +592,7 @@ void __init find_memory(void)
  * find_pernode_space() does most of this already, we just need to set
  * local_per_cpu_offset
  */
-void __cpuinit *per_cpu_init(void)
+void *per_cpu_init(void)
 {
        int cpu;
        static int first_time = 1;