3 files changed, 54 insertions, 0 deletions

diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 7440a0dcedd..7881406c03e 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -210,6 +210,13 @@
  * All archs are supposed to use RO_DATA() */
 #define RODATA RO_DATA(4096)
 
+#define DYN_ARRAY_INIT(align)                                                   \
+        . = ALIGN((align));                                             \
+        .dyn_array.init : AT(ADDR(.dyn_array.init) - LOAD_OFFSET) {     \
+                VMLINUX_SYMBOL(__dyn_array_start) = .;                  \
+                *(.dyn_array.init)                                      \
+                VMLINUX_SYMBOL(__dyn_array_end) = .;                    \
+        }
 #define SECURITY_INIT                                                   \
         .security_initcall.init : AT(ADDR(.security_initcall.init) - LOAD_OFFSET) { \
                 VMLINUX_SYMBOL(__security_initcall_start) = .;          \
diff --git a/include/linux/init.h b/include/linux/init.h
index 93538b696e3..cf9fa7f174a 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -246,6 +246,29 @@ struct obs_kernel_param {
 
 /* Relies on boot_command_line being set */
 void __init parse_early_param(void);
+
+struct dyn_array {
+        void **name;
+        unsigned long size;
+        unsigned int *nr;
+        unsigned long align;
+        void (*init_work)(void *);
+};
+extern struct dyn_array *__dyn_array_start[], *__dyn_array_end[];
+
+#define DEFINE_DYN_ARRAY(nameX, sizeX, nrX, alignX, init_workX) \
+                static struct dyn_array __dyn_array_##nameX __initdata = \
+                {       .name = (void **)&nameX,\
+                        .size = sizeX,\
+                        .nr   = &nrX,\
+                        .align = alignX,\
+                        .init_work = init_workX,\
+                }; \
+                static struct dyn_array *__dyn_array_ptr_##nameX __used \
+                __attribute__((__section__(".dyn_array.init"))) = \
+                        &__dyn_array_##nameX
+
+extern void pre_alloc_dyn_array(void);
 #endif /* __ASSEMBLY__ */
 
 /**
diff --git a/init/main.c b/init/main.c
index 27f6bf6108e..638d3a78641 100644
--- a/init/main.c
+++ b/init/main.c
@@ -536,6 +536,29 @@ 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
+}
+
 asmlinkage void __init start_kernel(void)
 {
         char * command_line;
@@ -567,6 +590,7 @@ asmlinkage void __init start_kernel(void)
         printk(KERN_NOTICE);
         printk(linux_banner);
         setup_arch(&command_line);
+        pre_alloc_dyn_array();
         mm_init_owner(&init_mm, &init_task);
         setup_command_line(command_line);
         unwind_setup();