summaryrefslogtreecommitdiffstats
path: root/init/main.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-05-02 19:09:35 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-05-02 19:09:35 -0700
commit89c9fea3c8034cdb2fd745f551cde0b507fd6893 (patch)
treec20880998ad9a212c83818eb3b62eaacab45a1fa /init/main.c
parent76f1948a79b26d5f57a5ee9941876b745c6baaea (diff)
parent6fbc8798d9461c0ff22fab9fbaddde13de815941 (diff)
downloadop-kernel-dev-89c9fea3c8034cdb2fd745f551cde0b507fd6893.zip
op-kernel-dev-89c9fea3c8034cdb2fd745f551cde0b507fd6893.tar.gz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: tty: fix comment for __tty_alloc_driver() init/main: properly align the multi-line comment init/main: Fix double "the" in comment Fix dead URLs to ftp.kernel.org drivers: Clean up duplicated email address treewide: Fix typo in xml/driver-api/basics.xml tools/testing/selftests/powerpc: remove redundant CFLAGS in Makefile: "-Wall -O2 -Wall" -> "-O2 -Wall" selftests/timers: Spelling s/privledges/privileges/ HID: picoLCD: Spelling s/REPORT_WRTIE_MEMORY/REPORT_WRITE_MEMORY/ net: phy: dp83848: Fix Typo UBI: Fix typos Documentation: ftrace.txt: Correct nice value of 120 priority net: fec: Fix typo in error msg and comment treewide: Fix typos in printk
Diffstat (limited to 'init/main.c')
-rw-r--r--init/main.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/init/main.c b/init/main.c
index b0c11cb..b1b9dbf 100644
--- 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);
OpenPOWER on IntegriCloud