commit 2e9a07f5568ebedd3ece63f58ed1d5249638b5b9
author Stewart Smith <stewart@linux.vnet.ibm.com> Mon Feb 26 11:02:45 2018 +1100
committer Stewart Smith <stewart@linux.vnet.ibm.com> Mon Feb 26 11:03:40 2018 +1100
tree c80602c576d65e0b074ad53e4b3278b896bae135
parent ba3f9662257dae96394b835f7bd3f9c27f835e40
parent e920f5dedb75e5c3f451c3607ea016f3fef2961c

Merge branch 'ipr-fast-reboot'

openpower/configs/linux/skiroot_p9_defconfig

diff --git a/openpower/configs/linux/skiroot_p9_defconfig b/openpower/configs/linux/skiroot_p9_defconfig
index 21f5c45..7b08bae 100644
--- a/openpower/configs/linux/skiroot_p9_defconfig
+++ b/openpower/configs/linux/skiroot_p9_defconfig
@@ -50,7 +50,7 @@
 CONFIG_PPC_64K_PAGES=y
 CONFIG_SCHED_SMT=y
 CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="console=tty0 console=hvc0"
+CONFIG_CMDLINE="console=tty0 console=hvc0 ipr.fast_reboot=1"
 # CONFIG_SECCOMP is not set
 CONFIG_NET=y
 CONFIG_PACKET=y