Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds

[linux-2.6-omap-h63xx.git] / include / linux / init.h

diff --git a/include/linux/init.h b/include/linux/init.h
index 59fbb4aaba6a18e6ad4e74cbeffd23ff8d2221b3..0c1264668be0ccb32ffa98a304a706dd1009b6f3 100644 (file)
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -40,7 +40,7 @@
 
 /* These are for everybody (although not all archs will actually
    discard it in modules) */
-#define __init         __section(.init.text) __cold
+#define __init         __section(.init.text) __cold notrace
 #define __initdata     __section(.init.data)
 #define __initconst    __section(.init.rodata)
 #define __exitdata     __section(.exit.data)
@@ -233,9 +233,6 @@ struct obs_kernel_param {
                __attribute__((aligned((sizeof(long)))))        \
                = { __setup_str_##unique_id, fn, early }
 
-#define __setup_null_param(str, unique_id)                     \
-       __setup_param(str, unique_id, NULL, 0)
-
 #define __setup(str, fn)                                       \
        __setup_param(str, fn, fn, 0)
 
@@ -246,50 +243,6 @@ 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[];
-extern struct dyn_array *__per_cpu_dyn_array_start[], *__per_cpu_dyn_array_end[];
-
-#define DEFINE_DYN_ARRAY_ADDR(nameX, addrX, 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
-
-#define DEFINE_DYN_ARRAY(nameX, sizeX, nrX, alignX, init_workX) \
-       DEFINE_DYN_ARRAY_ADDR(nameX, nameX, sizeX, nrX, alignX, init_workX)
-
-#define DEFINE_PER_CPU_DYN_ARRAY_ADDR(nameX, addrX, sizeX, nrX, alignX, init_workX) \
-               static struct dyn_array __per_cpu_dyn_array_##nameX __initdata = \
-               {       .name = (void **)&(addrX),\
-                       .size = sizeX,\
-                       .nr   = &(nrX),\
-                       .align = alignX,\
-                       .init_work = init_workX,\
-               }; \
-               static struct dyn_array *__per_cpu_dyn_array_ptr_##nameX __used \
-               __attribute__((__section__(".per_cpu_dyn_array.init"))) = \
-                       &__per_cpu_dyn_array_##nameX
-
-#define DEFINE_PER_CPU_DYN_ARRAY(nameX, sizeX, nrX, alignX, init_workX) \
-       DEFINE_PER_CPU_DYN_ARRAY_ADDR(nameX, nameX, nrX, alignX, init_workX)
-
-extern void pre_alloc_dyn_array(void);
-extern unsigned long per_cpu_dyn_array_size(unsigned long *align);
-extern void per_cpu_alloc_dyn_array(int cpu, char *ptr);
 #endif /* __ASSEMBLY__ */
 
 /**
@@ -340,7 +293,6 @@ extern void per_cpu_alloc_dyn_array(int cpu, char *ptr);
        void cleanup_module(void) __attribute__((alias(#exitfn)));
 
 #define __setup_param(str, unique_id, fn)      /* nothing */
-#define __setup_null_param(str, unique_id)     /* nothing */
 #define __setup(str, func)                     /* nothing */
 #endif