ide: add ide_proc_register_port()

[powerpc.git] / include / linux / init.h

diff --git a/include/linux/init.h b/include/linux/init.h
index e290a01..8bc32bb 100644 (file)
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -52,9 +52,14 @@
 #endif
 
 /* For assembly routines */
+#ifdef CONFIG_HOTPLUG_CPU
+#define __INIT         .section        ".text","ax"
+#define __INITDATA     .section        ".data","aw"
+#else
 #define __INIT         .section        ".init.text","ax"
-#define __FINIT                .previous
 #define __INITDATA     .section        ".init.data","aw"
+#endif
+#define __FINIT                .previous
 
 #ifndef __ASSEMBLY__
 /*
@@ -72,7 +77,8 @@ extern char *saved_command_line;
 extern unsigned int reset_devices;
 
 /* used by init/main.c */
-extern void setup_arch(char **);
+void setup_arch(char **);
+void prepare_namespace(void);
 
 #endif
   
@@ -228,7 +234,7 @@ void __init parse_early_param(void);
 #define __obsolete_setup(str)                  /* nothing */
 #endif
 
-/* Data marked not to be saved by software_suspend() */
+/* Data marked not to be saved by software suspend */
 #define __nosavedata __attribute__ ((__section__ (".data.nosave")))
 
 /* This means "can be init if no module support, otherwise module load