Merge branch 'kvm-selftest' into kvm-master

[linux-2.6-microblaze.git] / mm / percpu.c

diff --git a/mm/percpu.c b/mm/percpu.c
index e1c2083..f5b2c2e 100644 (file)
--- a/mm/percpu.c
+++ b/mm/percpu.c
@@ -146,7 +146,6 @@ static unsigned int pcpu_high_unit_cpu __ro_after_init;
 
 /* the address of the first chunk which starts with the kernel static area */
 void *pcpu_base_addr __ro_after_init;
-EXPORT_SYMBOL_GPL(pcpu_base_addr);
 
 static const int *pcpu_unit_map __ro_after_init;               /* cpu -> unit */
 const unsigned long *pcpu_unit_offsets __ro_after_init;        /* cpu -> unit offset */
@@ -2473,7 +2472,7 @@ struct pcpu_alloc_info * __init pcpu_alloc_alloc_info(int nr_groups,
  */
 void __init pcpu_free_alloc_info(struct pcpu_alloc_info *ai)
 {
-       memblock_free_early(__pa(ai), ai->__ai_size);
+       memblock_free(ai, ai->__ai_size);
 }
 
 /**
@@ -3135,7 +3134,7 @@ out_free_areas:
 out_free:
        pcpu_free_alloc_info(ai);
        if (areas)
-               memblock_free_early(__pa(areas), areas_size);
+               memblock_free(areas, areas_size);
        return rc;
 }
 #endif /* BUILD_EMBED_FIRST_CHUNK */
@@ -3257,7 +3256,7 @@ enomem:
                free_fn(page_address(pages[j]), PAGE_SIZE);
        rc = -ENOMEM;
 out_free_ar:
-       memblock_free_early(__pa(pages), pages_size);
+       memblock_free(pages, pages_size);
        pcpu_free_alloc_info(ai);
        return rc;
 }
@@ -3287,7 +3286,7 @@ static void * __init pcpu_dfl_fc_alloc(unsigned int cpu, size_t size,
 
 static void __init pcpu_dfl_fc_free(void *ptr, size_t size)
 {
-       memblock_free_early(__pa(ptr), size);
+       memblock_free(ptr, size);
 }
 
 void __init setup_per_cpu_areas(void)