Commit e76984cb authored by Thadeu Lima de Souza Cascardo's avatar Thadeu Lima de Souza Cascardo Committed by Stefan Bader

UBUNTU: [Config]: Set PANIC_TIMEOUT=10 on ppc64el

BugLink: https://bugs.launchpad.net/bugs/1730660

When stopping CPUS fail when doing kdump, the system will hang
indefinitively, instead of rebooting. Using the default value of 10 for
PANIC_TIMEOUT that we had for trusty allows the system to reboot.
Signed-off-by: default avatarThadeu Lima de Souza Cascardo <cascardo@canonical.com>
Acked-by: default avatarStefan Bader <stefan.bader@canonical.com>
Acked-by: default avatarColin King <colin.king@canonical.com>
Signed-off-by: default avatarStefan Bader <stefan.bader@canonical.com>
parent 245fd7dc
...@@ -273,6 +273,7 @@ CONFIG_OMFS_FS=m ...@@ -273,6 +273,7 @@ CONFIG_OMFS_FS=m
CONFIG_OSF_PARTITION=y CONFIG_OSF_PARTITION=y
CONFIG_OUTPUT_FORMAT="elf64-x86-64" CONFIG_OUTPUT_FORMAT="elf64-x86-64"
# CONFIG_PAGE_EXTENSION is not set # CONFIG_PAGE_EXTENSION is not set
CONFIG_PANIC_TIMEOUT=0
CONFIG_PARPORT=m CONFIG_PARPORT=m
CONFIG_PATA_SIS=y CONFIG_PATA_SIS=y
CONFIG_PCCARD=m CONFIG_PCCARD=m
......
...@@ -7854,7 +7854,7 @@ CONFIG_NO_HZ_IDLE note<LP:1413968> ...@@ -7854,7 +7854,7 @@ CONFIG_NO_HZ_IDLE note<LP:1413968>
# Menu: Kernel hacking # Menu: Kernel hacking
CONFIG_MAGIC_SYSRQ policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_MAGIC_SYSRQ policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
CONFIG_PANIC_ON_OOPS policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}> CONFIG_PANIC_ON_OOPS policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}>
CONFIG_PANIC_TIMEOUT policy<{'amd64': '0', 'arm64': '0', 'armhf': '0', 'i386': '0', 'powerpc': '0', 'ppc64el': '0', 's390x': '0'}> CONFIG_PANIC_TIMEOUT policy<{'amd64': '0', 'arm64': '0', 'armhf': '0', 'i386': '0', 'powerpc': '0', 'ppc64el': '10', 's390x': '0'}>
CONFIG_DEBUG_TIMEKEEPING policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}> CONFIG_DEBUG_TIMEKEEPING policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}>
CONFIG_STACKTRACE policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_STACKTRACE policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
CONFIG_PROVIDE_OHCI1394_DMA_INIT policy<{'amd64': 'n', 'i386': 'n'}> CONFIG_PROVIDE_OHCI1394_DMA_INIT policy<{'amd64': 'n', 'i386': 'n'}>
...@@ -275,6 +275,7 @@ CONFIG_OMFS_FS=m ...@@ -275,6 +275,7 @@ CONFIG_OMFS_FS=m
# CONFIG_OPENNSL is not set # CONFIG_OPENNSL is not set
CONFIG_OSF_PARTITION=y CONFIG_OSF_PARTITION=y
# CONFIG_PAGE_EXTENSION is not set # CONFIG_PAGE_EXTENSION is not set
CONFIG_PANIC_TIMEOUT=0
CONFIG_PARPORT=m CONFIG_PARPORT=m
CONFIG_PATA_SIS=m CONFIG_PATA_SIS=m
CONFIG_PCIPCWATCHDOG=m CONFIG_PCIPCWATCHDOG=m
......
...@@ -266,6 +266,7 @@ CONFIG_OMFS_FS=m ...@@ -266,6 +266,7 @@ CONFIG_OMFS_FS=m
CONFIG_OSF_PARTITION=y CONFIG_OSF_PARTITION=y
CONFIG_PAGE_EXTENSION=y CONFIG_PAGE_EXTENSION=y
CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_PAGE_OFFSET=0xC0000000
CONFIG_PANIC_TIMEOUT=0
CONFIG_PARPORT=m CONFIG_PARPORT=m
CONFIG_PATA_SIS=m CONFIG_PATA_SIS=m
# CONFIG_PCCARD is not set # CONFIG_PCCARD is not set
......
...@@ -5546,7 +5546,6 @@ CONFIG_PANEL_PARPORT=0 ...@@ -5546,7 +5546,6 @@ CONFIG_PANEL_PARPORT=0
CONFIG_PANEL_PROFILE=5 CONFIG_PANEL_PROFILE=5
# CONFIG_PANIC_ON_OOPS is not set # CONFIG_PANIC_ON_OOPS is not set
CONFIG_PANIC_ON_OOPS_VALUE=0 CONFIG_PANIC_ON_OOPS_VALUE=0
CONFIG_PANIC_TIMEOUT=0
CONFIG_PANTHERLORD_FF=y CONFIG_PANTHERLORD_FF=y
CONFIG_PARAVIRT=y CONFIG_PARAVIRT=y
CONFIG_PARAVIRT_CLOCK=y CONFIG_PARAVIRT_CLOCK=y
......
...@@ -270,6 +270,7 @@ CONFIG_OSF_PARTITION=y ...@@ -270,6 +270,7 @@ CONFIG_OSF_PARTITION=y
CONFIG_OUTPUT_FORMAT="elf32-i386" CONFIG_OUTPUT_FORMAT="elf32-i386"
CONFIG_PAGE_EXTENSION=y CONFIG_PAGE_EXTENSION=y
CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_PAGE_OFFSET=0xC0000000
CONFIG_PANIC_TIMEOUT=0
CONFIG_PARPORT=m CONFIG_PARPORT=m
CONFIG_PATA_SIS=y CONFIG_PATA_SIS=y
CONFIG_PCCARD=m CONFIG_PCCARD=m
......
...@@ -260,6 +260,7 @@ CONFIG_OF=y ...@@ -260,6 +260,7 @@ CONFIG_OF=y
CONFIG_OMFS_FS=m CONFIG_OMFS_FS=m
# CONFIG_OPENNSL is not set # CONFIG_OPENNSL is not set
CONFIG_OSF_PARTITION=y CONFIG_OSF_PARTITION=y
CONFIG_PANIC_TIMEOUT=0
CONFIG_PARPORT=m CONFIG_PARPORT=m
CONFIG_PATA_SIS=m CONFIG_PATA_SIS=m
CONFIG_PCCARD=m CONFIG_PCCARD=m
......
...@@ -288,6 +288,7 @@ CONFIG_OMFS_FS=m ...@@ -288,6 +288,7 @@ CONFIG_OMFS_FS=m
CONFIG_OSF_PARTITION=y CONFIG_OSF_PARTITION=y
# CONFIG_PAGE_EXTENSION is not set # CONFIG_PAGE_EXTENSION is not set
CONFIG_PAGE_OFFSET=0xc000000000000000 CONFIG_PAGE_OFFSET=0xc000000000000000
CONFIG_PANIC_TIMEOUT=10
CONFIG_PARPORT=m CONFIG_PARPORT=m
CONFIG_PATA_SIS=m CONFIG_PATA_SIS=m
# CONFIG_PCCARD is not set # CONFIG_PCCARD is not set
......
...@@ -231,6 +231,7 @@ CONFIG_NUMA_EMU=y ...@@ -231,6 +231,7 @@ CONFIG_NUMA_EMU=y
# CONFIG_OMFS_FS is not set # CONFIG_OMFS_FS is not set
# CONFIG_OSF_PARTITION is not set # CONFIG_OSF_PARTITION is not set
# CONFIG_PAGE_EXTENSION is not set # CONFIG_PAGE_EXTENSION is not set
CONFIG_PANIC_TIMEOUT=0
# CONFIG_PARPORT is not set # CONFIG_PARPORT is not set
# CONFIG_PCIPCWATCHDOG is not set # CONFIG_PCIPCWATCHDOG is not set
# CONFIG_PCI_PASID is not set # CONFIG_PCI_PASID is not set
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment