| Message ID | 20171116111144.12041-1-cascardo@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [Xenial] UBUNTU: [Config]: Set PANIC_TIMEOUT=10 on ppc64el | expand |
On 16.11.2017 12:11, Thadeu Lima de Souza Cascardo wrote: > 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: Thadeu Lima de Souza Cascardo <cascardo@canonical.com> Acked-by: Stefan Bader <stefan.bader@canonical.com> > --- > debian.master/config/amd64/config.common.amd64 | 1 + > debian.master/config/annotations | 2 +- > debian.master/config/arm64/config.common.arm64 | 1 + > debian.master/config/armhf/config.common.armhf | 1 + > debian.master/config/config.common.ubuntu | 1 - > debian.master/config/i386/config.common.i386 | 1 + > debian.master/config/powerpc/config.common.powerpc | 1 + > debian.master/config/ppc64el/config.common.ppc64el | 1 + > debian.master/config/s390x/config.common.s390x | 1 + > 9 files changed, 8 insertions(+), 2 deletions(-) > > diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 > index 443d7650d9c3..1377cde70717 100644 > --- a/debian.master/config/amd64/config.common.amd64 > +++ b/debian.master/config/amd64/config.common.amd64 > @@ -273,6 +273,7 @@ CONFIG_OMFS_FS=m > CONFIG_OSF_PARTITION=y > CONFIG_OUTPUT_FORMAT="elf64-x86-64" > # CONFIG_PAGE_EXTENSION is not set > +CONFIG_PANIC_TIMEOUT=0 > CONFIG_PARPORT=m > CONFIG_PATA_SIS=y > CONFIG_PCCARD=m > diff --git a/debian.master/config/annotations b/debian.master/config/annotations > index a7feba536ead..03907f561f70 100644 > --- a/debian.master/config/annotations > +++ b/debian.master/config/annotations > @@ -7854,7 +7854,7 @@ CONFIG_NO_HZ_IDLE note<LP:1413968> > # Menu: Kernel hacking > 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_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_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'}> > diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 > index 4385e88f57ea..06c6881ddf1d 100644 > --- a/debian.master/config/arm64/config.common.arm64 > +++ b/debian.master/config/arm64/config.common.arm64 > @@ -275,6 +275,7 @@ CONFIG_OMFS_FS=m > # CONFIG_OPENNSL is not set > CONFIG_OSF_PARTITION=y > # CONFIG_PAGE_EXTENSION is not set > +CONFIG_PANIC_TIMEOUT=0 > CONFIG_PARPORT=m > CONFIG_PATA_SIS=m > CONFIG_PCIPCWATCHDOG=m > diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf > index 246054c8102d..ff5a338a47a4 100644 > --- a/debian.master/config/armhf/config.common.armhf > +++ b/debian.master/config/armhf/config.common.armhf > @@ -266,6 +266,7 @@ CONFIG_OMFS_FS=m > CONFIG_OSF_PARTITION=y > CONFIG_PAGE_EXTENSION=y > CONFIG_PAGE_OFFSET=0xC0000000 > +CONFIG_PANIC_TIMEOUT=0 > CONFIG_PARPORT=m > CONFIG_PATA_SIS=m > # CONFIG_PCCARD is not set > diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu > index 5b24e77bb073..1582a41dd392 100644 > --- a/debian.master/config/config.common.ubuntu > +++ b/debian.master/config/config.common.ubuntu > @@ -5545,7 +5545,6 @@ CONFIG_PANEL_PARPORT=0 > CONFIG_PANEL_PROFILE=5 > # CONFIG_PANIC_ON_OOPS is not set > CONFIG_PANIC_ON_OOPS_VALUE=0 > -CONFIG_PANIC_TIMEOUT=0 > CONFIG_PANTHERLORD_FF=y > CONFIG_PARAVIRT=y > CONFIG_PARAVIRT_CLOCK=y > diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 > index f2c2512e7221..40538ef30078 100644 > --- a/debian.master/config/i386/config.common.i386 > +++ b/debian.master/config/i386/config.common.i386 > @@ -270,6 +270,7 @@ CONFIG_OSF_PARTITION=y > CONFIG_OUTPUT_FORMAT="elf32-i386" > CONFIG_PAGE_EXTENSION=y > CONFIG_PAGE_OFFSET=0xC0000000 > +CONFIG_PANIC_TIMEOUT=0 > CONFIG_PARPORT=m > CONFIG_PATA_SIS=y > CONFIG_PCCARD=m > diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc > index 582c02623d7b..41c182db7102 100644 > --- a/debian.master/config/powerpc/config.common.powerpc > +++ b/debian.master/config/powerpc/config.common.powerpc > @@ -260,6 +260,7 @@ CONFIG_OF=y > CONFIG_OMFS_FS=m > # CONFIG_OPENNSL is not set > CONFIG_OSF_PARTITION=y > +CONFIG_PANIC_TIMEOUT=0 > CONFIG_PARPORT=m > CONFIG_PATA_SIS=m > CONFIG_PCCARD=m > diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el > index 66ae2e18f5b8..d4a69ea194e6 100644 > --- a/debian.master/config/ppc64el/config.common.ppc64el > +++ b/debian.master/config/ppc64el/config.common.ppc64el > @@ -288,6 +288,7 @@ CONFIG_OMFS_FS=m > CONFIG_OSF_PARTITION=y > # CONFIG_PAGE_EXTENSION is not set > CONFIG_PAGE_OFFSET=0xc000000000000000 > +CONFIG_PANIC_TIMEOUT=10 > CONFIG_PARPORT=m > CONFIG_PATA_SIS=m > # CONFIG_PCCARD is not set > diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x > index 5deba19a2f2a..b82bf27ba176 100644 > --- a/debian.master/config/s390x/config.common.s390x > +++ b/debian.master/config/s390x/config.common.s390x > @@ -231,6 +231,7 @@ CONFIG_NUMA_EMU=y > # CONFIG_OMFS_FS is not set > # CONFIG_OSF_PARTITION is not set > # CONFIG_PAGE_EXTENSION is not set > +CONFIG_PANIC_TIMEOUT=0 > # CONFIG_PARPORT is not set > # CONFIG_PCIPCWATCHDOG is not set > # CONFIG_PCI_PASID is not set >
On 16/11/17 11:11, Thadeu Lima de Souza Cascardo wrote: > 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: Thadeu Lima de Souza Cascardo <cascardo@canonical.com> > --- > debian.master/config/amd64/config.common.amd64 | 1 + > debian.master/config/annotations | 2 +- > debian.master/config/arm64/config.common.arm64 | 1 + > debian.master/config/armhf/config.common.armhf | 1 + > debian.master/config/config.common.ubuntu | 1 - > debian.master/config/i386/config.common.i386 | 1 + > debian.master/config/powerpc/config.common.powerpc | 1 + > debian.master/config/ppc64el/config.common.ppc64el | 1 + > debian.master/config/s390x/config.common.s390x | 1 + > 9 files changed, 8 insertions(+), 2 deletions(-) > > diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 > index 443d7650d9c3..1377cde70717 100644 > --- a/debian.master/config/amd64/config.common.amd64 > +++ b/debian.master/config/amd64/config.common.amd64 > @@ -273,6 +273,7 @@ CONFIG_OMFS_FS=m > CONFIG_OSF_PARTITION=y > CONFIG_OUTPUT_FORMAT="elf64-x86-64" > # CONFIG_PAGE_EXTENSION is not set > +CONFIG_PANIC_TIMEOUT=0 > CONFIG_PARPORT=m > CONFIG_PATA_SIS=y > CONFIG_PCCARD=m > diff --git a/debian.master/config/annotations b/debian.master/config/annotations > index a7feba536ead..03907f561f70 100644 > --- a/debian.master/config/annotations > +++ b/debian.master/config/annotations > @@ -7854,7 +7854,7 @@ CONFIG_NO_HZ_IDLE note<LP:1413968> > # Menu: Kernel hacking > 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_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_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'}> > diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 > index 4385e88f57ea..06c6881ddf1d 100644 > --- a/debian.master/config/arm64/config.common.arm64 > +++ b/debian.master/config/arm64/config.common.arm64 > @@ -275,6 +275,7 @@ CONFIG_OMFS_FS=m > # CONFIG_OPENNSL is not set > CONFIG_OSF_PARTITION=y > # CONFIG_PAGE_EXTENSION is not set > +CONFIG_PANIC_TIMEOUT=0 > CONFIG_PARPORT=m > CONFIG_PATA_SIS=m > CONFIG_PCIPCWATCHDOG=m > diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf > index 246054c8102d..ff5a338a47a4 100644 > --- a/debian.master/config/armhf/config.common.armhf > +++ b/debian.master/config/armhf/config.common.armhf > @@ -266,6 +266,7 @@ CONFIG_OMFS_FS=m > CONFIG_OSF_PARTITION=y > CONFIG_PAGE_EXTENSION=y > CONFIG_PAGE_OFFSET=0xC0000000 > +CONFIG_PANIC_TIMEOUT=0 > CONFIG_PARPORT=m > CONFIG_PATA_SIS=m > # CONFIG_PCCARD is not set > diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu > index 5b24e77bb073..1582a41dd392 100644 > --- a/debian.master/config/config.common.ubuntu > +++ b/debian.master/config/config.common.ubuntu > @@ -5545,7 +5545,6 @@ CONFIG_PANEL_PARPORT=0 > CONFIG_PANEL_PROFILE=5 > # CONFIG_PANIC_ON_OOPS is not set > CONFIG_PANIC_ON_OOPS_VALUE=0 > -CONFIG_PANIC_TIMEOUT=0 > CONFIG_PANTHERLORD_FF=y > CONFIG_PARAVIRT=y > CONFIG_PARAVIRT_CLOCK=y > diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 > index f2c2512e7221..40538ef30078 100644 > --- a/debian.master/config/i386/config.common.i386 > +++ b/debian.master/config/i386/config.common.i386 > @@ -270,6 +270,7 @@ CONFIG_OSF_PARTITION=y > CONFIG_OUTPUT_FORMAT="elf32-i386" > CONFIG_PAGE_EXTENSION=y > CONFIG_PAGE_OFFSET=0xC0000000 > +CONFIG_PANIC_TIMEOUT=0 > CONFIG_PARPORT=m > CONFIG_PATA_SIS=y > CONFIG_PCCARD=m > diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc > index 582c02623d7b..41c182db7102 100644 > --- a/debian.master/config/powerpc/config.common.powerpc > +++ b/debian.master/config/powerpc/config.common.powerpc > @@ -260,6 +260,7 @@ CONFIG_OF=y > CONFIG_OMFS_FS=m > # CONFIG_OPENNSL is not set > CONFIG_OSF_PARTITION=y > +CONFIG_PANIC_TIMEOUT=0 > CONFIG_PARPORT=m > CONFIG_PATA_SIS=m > CONFIG_PCCARD=m > diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el > index 66ae2e18f5b8..d4a69ea194e6 100644 > --- a/debian.master/config/ppc64el/config.common.ppc64el > +++ b/debian.master/config/ppc64el/config.common.ppc64el > @@ -288,6 +288,7 @@ CONFIG_OMFS_FS=m > CONFIG_OSF_PARTITION=y > # CONFIG_PAGE_EXTENSION is not set > CONFIG_PAGE_OFFSET=0xc000000000000000 > +CONFIG_PANIC_TIMEOUT=10 > CONFIG_PARPORT=m > CONFIG_PATA_SIS=m > # CONFIG_PCCARD is not set > diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x > index 5deba19a2f2a..b82bf27ba176 100644 > --- a/debian.master/config/s390x/config.common.s390x > +++ b/debian.master/config/s390x/config.common.s390x > @@ -231,6 +231,7 @@ CONFIG_NUMA_EMU=y > # CONFIG_OMFS_FS is not set > # CONFIG_OSF_PARTITION is not set > # CONFIG_PAGE_EXTENSION is not set > +CONFIG_PANIC_TIMEOUT=0 > # CONFIG_PARPORT is not set > # CONFIG_PCIPCWATCHDOG is not set > # CONFIG_PCI_PASID is not set > Acked-by: Colin Ian King <colin.king@canonical.com>
On 16.11.2017 12:11, Thadeu Lima de Souza Cascardo wrote: > 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: Thadeu Lima de Souza Cascardo <cascardo@canonical.com> > --- > debian.master/config/amd64/config.common.amd64 | 1 + > debian.master/config/annotations | 2 +- > debian.master/config/arm64/config.common.arm64 | 1 + > debian.master/config/armhf/config.common.armhf | 1 + > debian.master/config/config.common.ubuntu | 1 - > debian.master/config/i386/config.common.i386 | 1 + > debian.master/config/powerpc/config.common.powerpc | 1 + > debian.master/config/ppc64el/config.common.ppc64el | 1 + > debian.master/config/s390x/config.common.s390x | 1 + > 9 files changed, 8 insertions(+), 2 deletions(-) > > diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 > index 443d7650d9c3..1377cde70717 100644 > --- a/debian.master/config/amd64/config.common.amd64 > +++ b/debian.master/config/amd64/config.common.amd64 > @@ -273,6 +273,7 @@ CONFIG_OMFS_FS=m > CONFIG_OSF_PARTITION=y > CONFIG_OUTPUT_FORMAT="elf64-x86-64" > # CONFIG_PAGE_EXTENSION is not set > +CONFIG_PANIC_TIMEOUT=0 > CONFIG_PARPORT=m > CONFIG_PATA_SIS=y > CONFIG_PCCARD=m > diff --git a/debian.master/config/annotations b/debian.master/config/annotations > index a7feba536ead..03907f561f70 100644 > --- a/debian.master/config/annotations > +++ b/debian.master/config/annotations > @@ -7854,7 +7854,7 @@ CONFIG_NO_HZ_IDLE note<LP:1413968> > # Menu: Kernel hacking > 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_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_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'}> > diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 > index 4385e88f57ea..06c6881ddf1d 100644 > --- a/debian.master/config/arm64/config.common.arm64 > +++ b/debian.master/config/arm64/config.common.arm64 > @@ -275,6 +275,7 @@ CONFIG_OMFS_FS=m > # CONFIG_OPENNSL is not set > CONFIG_OSF_PARTITION=y > # CONFIG_PAGE_EXTENSION is not set > +CONFIG_PANIC_TIMEOUT=0 > CONFIG_PARPORT=m > CONFIG_PATA_SIS=m > CONFIG_PCIPCWATCHDOG=m > diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf > index 246054c8102d..ff5a338a47a4 100644 > --- a/debian.master/config/armhf/config.common.armhf > +++ b/debian.master/config/armhf/config.common.armhf > @@ -266,6 +266,7 @@ CONFIG_OMFS_FS=m > CONFIG_OSF_PARTITION=y > CONFIG_PAGE_EXTENSION=y > CONFIG_PAGE_OFFSET=0xC0000000 > +CONFIG_PANIC_TIMEOUT=0 > CONFIG_PARPORT=m > CONFIG_PATA_SIS=m > # CONFIG_PCCARD is not set > diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu > index 5b24e77bb073..1582a41dd392 100644 > --- a/debian.master/config/config.common.ubuntu > +++ b/debian.master/config/config.common.ubuntu > @@ -5545,7 +5545,6 @@ CONFIG_PANEL_PARPORT=0 > CONFIG_PANEL_PROFILE=5 > # CONFIG_PANIC_ON_OOPS is not set > CONFIG_PANIC_ON_OOPS_VALUE=0 > -CONFIG_PANIC_TIMEOUT=0 > CONFIG_PANTHERLORD_FF=y > CONFIG_PARAVIRT=y > CONFIG_PARAVIRT_CLOCK=y > diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 > index f2c2512e7221..40538ef30078 100644 > --- a/debian.master/config/i386/config.common.i386 > +++ b/debian.master/config/i386/config.common.i386 > @@ -270,6 +270,7 @@ CONFIG_OSF_PARTITION=y > CONFIG_OUTPUT_FORMAT="elf32-i386" > CONFIG_PAGE_EXTENSION=y > CONFIG_PAGE_OFFSET=0xC0000000 > +CONFIG_PANIC_TIMEOUT=0 > CONFIG_PARPORT=m > CONFIG_PATA_SIS=y > CONFIG_PCCARD=m > diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc > index 582c02623d7b..41c182db7102 100644 > --- a/debian.master/config/powerpc/config.common.powerpc > +++ b/debian.master/config/powerpc/config.common.powerpc > @@ -260,6 +260,7 @@ CONFIG_OF=y > CONFIG_OMFS_FS=m > # CONFIG_OPENNSL is not set > CONFIG_OSF_PARTITION=y > +CONFIG_PANIC_TIMEOUT=0 > CONFIG_PARPORT=m > CONFIG_PATA_SIS=m > CONFIG_PCCARD=m > diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el > index 66ae2e18f5b8..d4a69ea194e6 100644 > --- a/debian.master/config/ppc64el/config.common.ppc64el > +++ b/debian.master/config/ppc64el/config.common.ppc64el > @@ -288,6 +288,7 @@ CONFIG_OMFS_FS=m > CONFIG_OSF_PARTITION=y > # CONFIG_PAGE_EXTENSION is not set > CONFIG_PAGE_OFFSET=0xc000000000000000 > +CONFIG_PANIC_TIMEOUT=10 > CONFIG_PARPORT=m > CONFIG_PATA_SIS=m > # CONFIG_PCCARD is not set > diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x > index 5deba19a2f2a..b82bf27ba176 100644 > --- a/debian.master/config/s390x/config.common.s390x > +++ b/debian.master/config/s390x/config.common.s390x > @@ -231,6 +231,7 @@ CONFIG_NUMA_EMU=y > # CONFIG_OMFS_FS is not set > # CONFIG_OSF_PARTITION is not set > # CONFIG_PAGE_EXTENSION is not set > +CONFIG_PANIC_TIMEOUT=0 > # CONFIG_PARPORT is not set > # CONFIG_PCIPCWATCHDOG is not set > # CONFIG_PCI_PASID is not set > Applied to Xenial master-next. Thanks.
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 443d7650d9c3..1377cde70717 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -273,6 +273,7 @@ CONFIG_OMFS_FS=m CONFIG_OSF_PARTITION=y CONFIG_OUTPUT_FORMAT="elf64-x86-64" # CONFIG_PAGE_EXTENSION is not set +CONFIG_PANIC_TIMEOUT=0 CONFIG_PARPORT=m CONFIG_PATA_SIS=y CONFIG_PCCARD=m diff --git a/debian.master/config/annotations b/debian.master/config/annotations index a7feba536ead..03907f561f70 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -7854,7 +7854,7 @@ CONFIG_NO_HZ_IDLE note<LP:1413968> # Menu: Kernel hacking 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_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_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'}> diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index 4385e88f57ea..06c6881ddf1d 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -275,6 +275,7 @@ CONFIG_OMFS_FS=m # CONFIG_OPENNSL is not set CONFIG_OSF_PARTITION=y # CONFIG_PAGE_EXTENSION is not set +CONFIG_PANIC_TIMEOUT=0 CONFIG_PARPORT=m CONFIG_PATA_SIS=m CONFIG_PCIPCWATCHDOG=m diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index 246054c8102d..ff5a338a47a4 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -266,6 +266,7 @@ CONFIG_OMFS_FS=m CONFIG_OSF_PARTITION=y CONFIG_PAGE_EXTENSION=y CONFIG_PAGE_OFFSET=0xC0000000 +CONFIG_PANIC_TIMEOUT=0 CONFIG_PARPORT=m CONFIG_PATA_SIS=m # CONFIG_PCCARD is not set diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 5b24e77bb073..1582a41dd392 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -5545,7 +5545,6 @@ CONFIG_PANEL_PARPORT=0 CONFIG_PANEL_PROFILE=5 # CONFIG_PANIC_ON_OOPS is not set CONFIG_PANIC_ON_OOPS_VALUE=0 -CONFIG_PANIC_TIMEOUT=0 CONFIG_PANTHERLORD_FF=y CONFIG_PARAVIRT=y CONFIG_PARAVIRT_CLOCK=y diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index f2c2512e7221..40538ef30078 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -270,6 +270,7 @@ CONFIG_OSF_PARTITION=y CONFIG_OUTPUT_FORMAT="elf32-i386" CONFIG_PAGE_EXTENSION=y CONFIG_PAGE_OFFSET=0xC0000000 +CONFIG_PANIC_TIMEOUT=0 CONFIG_PARPORT=m CONFIG_PATA_SIS=y CONFIG_PCCARD=m diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 582c02623d7b..41c182db7102 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -260,6 +260,7 @@ CONFIG_OF=y CONFIG_OMFS_FS=m # CONFIG_OPENNSL is not set CONFIG_OSF_PARTITION=y +CONFIG_PANIC_TIMEOUT=0 CONFIG_PARPORT=m CONFIG_PATA_SIS=m CONFIG_PCCARD=m diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index 66ae2e18f5b8..d4a69ea194e6 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -288,6 +288,7 @@ CONFIG_OMFS_FS=m CONFIG_OSF_PARTITION=y # CONFIG_PAGE_EXTENSION is not set CONFIG_PAGE_OFFSET=0xc000000000000000 +CONFIG_PANIC_TIMEOUT=10 CONFIG_PARPORT=m CONFIG_PATA_SIS=m # CONFIG_PCCARD is not set diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x index 5deba19a2f2a..b82bf27ba176 100644 --- a/debian.master/config/s390x/config.common.s390x +++ b/debian.master/config/s390x/config.common.s390x @@ -231,6 +231,7 @@ CONFIG_NUMA_EMU=y # CONFIG_OMFS_FS is not set # CONFIG_OSF_PARTITION is not set # CONFIG_PAGE_EXTENSION is not set +CONFIG_PANIC_TIMEOUT=0 # CONFIG_PARPORT is not set # CONFIG_PCIPCWATCHDOG is not set # CONFIG_PCI_PASID is not set
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: Thadeu Lima de Souza Cascardo <cascardo@canonical.com> --- debian.master/config/amd64/config.common.amd64 | 1 + debian.master/config/annotations | 2 +- debian.master/config/arm64/config.common.arm64 | 1 + debian.master/config/armhf/config.common.armhf | 1 + debian.master/config/config.common.ubuntu | 1 - debian.master/config/i386/config.common.i386 | 1 + debian.master/config/powerpc/config.common.powerpc | 1 + debian.master/config/ppc64el/config.common.ppc64el | 1 + debian.master/config/s390x/config.common.s390x | 1 + 9 files changed, 8 insertions(+), 2 deletions(-)