1 files changed, 12 insertions, 11 deletions

diff --git a/init/main.c b/init/main.c
index e8ae1fef0908..bb1aed928f21 100644
--- a/init/main.c
+++ b/init/main.c
@@ -6,7 +6,7 @@
  *  GK 2/5/95  -  Changed to support mounting root fs via NFS
  *  Added initrd & change_root: Werner Almesberger & Hans Lermen, Feb '96
  *  Moan early if gcc is old, avoiding bogus kernels - Paul Gortmaker, May '96
- *  Simplified starting of init:  Michael A. Griffith <grif@acm.org> 
+ *  Simplified starting of init:  Michael A. Griffith <grif@acm.org>
  */
 
 #define DEBUG           /* Enable initcall_debug */
@@ -136,7 +136,7 @@ static char *ramdisk_execute_command;
  * Used to generate warnings if static_key manipulation functions are used
  * before jump_label_init is called.
  */
-bool static_key_initialized __read_mostly = false;
+bool static_key_initialized __read_mostly;
 EXPORT_SYMBOL_GPL(static_key_initialized);
 
 /*
@@ -159,8 +159,8 @@ static int __init set_reset_devices(char *str)
 
 __setup("reset_devices", set_reset_devices);
 
-static const char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
-const char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
+static const char *argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
+const char *envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
 static const char *panic_later, *panic_param;
 
 extern const struct obs_kernel_param __setup_start[], __setup_end[];
@@ -199,7 +199,6 @@ static int __init obsolete_checksetup(char *line)
  * still work even if initially too large, it will just take slightly longer
  */
 unsigned long loops_per_jiffy = (1<<12);
-
 EXPORT_SYMBOL(loops_per_jiffy);
 
 static int __init debug_kernel(char *str)
@@ -376,8 +375,8 @@ static void __init setup_command_line(char *command_line)
         initcall_command_line =
                 memblock_virt_alloc(strlen(boot_command_line) + 1, 0);
         static_command_line = memblock_virt_alloc(strlen(command_line) + 1, 0);
-        strcpy (saved_command_line, boot_command_line);
-        strcpy (static_command_line, command_line);
+        strcpy(saved_command_line, boot_command_line);
+        strcpy(static_command_line, command_line);
 }
 
 /*
@@ -445,8 +444,8 @@ void __init parse_early_options(char *cmdline)
 /* Arch code calls this early on, or if not, just before other parsing. */
 void __init parse_early_param(void)
 {
-        static __initdata int done = 0;
-        static __initdata char tmp_cmdline[COMMAND_LINE_SIZE];
+        static int done __initdata;
+        static char tmp_cmdline[COMMAND_LINE_SIZE] __initdata;
 
         if (done)
                 return;
@@ -500,7 +499,8 @@ static void __init mm_init(void)
 
 asmlinkage __visible void __init start_kernel(void)
 {
-        char * command_line, *after_dashes;
+        char *command_line;
+        char *after_dashes;
         extern const struct kernel_param __start___param[], __stop___param[];
 
         /*
@@ -572,7 +572,8 @@ asmlinkage __visible void __init start_kernel(void)
          * fragile until we cpu_idle() for the first time.
          */
         preempt_disable();
-        if (WARN(!irqs_disabled(), "Interrupts were enabled *very* early, fixing it\n"))
+        if (WARN(!irqs_disabled(),
+                 "Interrupts were enabled *very* early, fixing it\n"))
                 local_irq_disable();
         idr_init_cache();
         rcu_init();