x86: apic copy calibrate_APIC_clock to each other in apic_32/64.c

[deliverable/linux.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index 416bca4f734fdec102ebfe22f36922d9e02afd4b..e81cf427d9c7a43d42b93ca2a8aed3a1ab64f089 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -394,10 +394,14 @@ static void __init setup_per_cpu_areas(void)
        unsigned long size, i, old_size;
        char *ptr;
        unsigned long nr_possible_cpus = num_possible_cpus();
+       unsigned long align = 1;
+       unsigned da_size;
 
        /* Copy section for each CPU (we discard the original) */
        old_size = PERCPU_ENOUGH_ROOM;
-       size = ALIGN(old_size + per_cpu_dyn_array_size(), PAGE_SIZE);
+       da_size = per_cpu_dyn_array_size(&align);
+       align = max_t(unsigned long, PAGE_SIZE, align);
+       size = ALIGN(old_size + da_size, align);
        ptr = alloc_bootmem_pages(size * nr_possible_cpus);
 
        for_each_possible_cpu(i) {
@@ -538,86 +542,6 @@ void __init __weak thread_info_cache_init(void)
 {
 }
 
-void pre_alloc_dyn_array(void)
-{
-#ifdef CONFIG_HAVE_DYN_ARRAY
-       unsigned long size, phys = 0;
-       struct dyn_array **daa;
-
-       for (daa = __dyn_array_start ; daa < __dyn_array_end; daa++) {
-               struct dyn_array *da = *daa;
-
-               size = da->size * (*da->nr);
-               print_fn_descriptor_symbol("dyna_array %s ", da->name);
-               printk(KERN_CONT "size:%#lx nr:%d align:%#lx",
-                       da->size, *da->nr, da->align);
-               *da->name = __alloc_bootmem(size, da->align, phys);
-               phys = virt_to_phys(*da->name);
-               printk(KERN_CONT " ==> [%#lx - %#lx]\n", phys, phys + size);
-
-               if (da->init_work)
-                       da->init_work(da);
-       }
-#endif
-}
-
-unsigned long per_cpu_dyn_array_size(void)
-{
-       unsigned long total_size = 0;
-#ifdef CONFIG_HAVE_DYN_ARRAY
-       unsigned long size;
-       struct dyn_array **daa;
-
-       for (daa = __per_cpu_dyn_array_start ; daa < __per_cpu_dyn_array_end; daa++) {
-               struct dyn_array *da = *daa;
-
-               size = da->size * (*da->nr);
-               print_fn_descriptor_symbol("per_cpu_dyna_array %s ", da->name);
-               printk(KERN_CONT "size:%#lx nr:%d align:%#lx\n",
-                       da->size, *da->nr, da->align);
-               total_size += roundup(size, da->align);
-       }
-       if (total_size)
-               printk(KERN_DEBUG "per_cpu_dyna_array total_size: %#lx\n",
-                        total_size);
-#endif
-       return total_size;
-}
-
-void per_cpu_alloc_dyn_array(int cpu, char *ptr)
-{
-#ifdef CONFIG_HAVE_DYN_ARRAY
-       unsigned long size, phys;
-       struct dyn_array **daa;
-       unsigned long addr;
-       void **array;
-
-       phys = virt_to_phys(ptr);
-
-       for (daa = __per_cpu_dyn_array_start ; daa < __per_cpu_dyn_array_end; daa++) {
-               struct dyn_array *da = *daa;
-
-               size = da->size * (*da->nr);
-               print_fn_descriptor_symbol("per_cpu_dyna_array %s ", da->name);
-               printk(KERN_CONT "size:%#lx nr:%d align:%#lx",
-                       da->size, *da->nr, da->align);
-
-               phys = roundup(phys, da->align);
-               addr = (unsigned long)da->name;
-               addr += per_cpu_offset(cpu);
-               array = (void **)addr;
-               *array = phys_to_virt(phys);
-               *da->name = *array; /* so init_work could use it directly */
-               printk(KERN_CONT " %p ==> [%#lx - %#lx]\n", array, phys, phys + size);
-               phys += size;
-
-               if (da->init_work) {
-                       da->init_work(da);
-               }
-       }
-#endif
-}
-
 asmlinkage void __init start_kernel(void)
 {
        char * command_line;