Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[platform/kernel/linux-exynos.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index b0c11cb..b1b9dbf 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -495,7 +495,7 @@ asmlinkage __visible void __init start_kernel(void)
        debug_objects_early_init();
 
        /*
-        * Set up the the initial canary ASAP:
+        * Set up the initial canary ASAP:
         */
        boot_init_stack_canary();
 
@@ -504,10 +504,10 @@ asmlinkage __visible void __init start_kernel(void)
        local_irq_disable();
        early_boot_irqs_disabled = true;
 
-/*
- * Interrupts are still disabled. Do necessary setups, then
- * enable them
- */
+       /*
+        * Interrupts are still disabled. Do necessary setups, then
+        * enable them.
+        */
        boot_cpu_init();
        page_address_init();
        pr_notice("%s", linux_banner);