Messages in this thread Patch in this message | | | Date | Tue, 19 Nov 2013 23:51:27 +0900 | From | Shinya Kuribayashi <> | Subject | Re: [PATCH v2] panic: Make panic_timeout configurable |
| |
On 11/19/13 6:02 PM, Ralf Baechle wrote:> On Mon, Nov 18, 2013 at 09:04:36PM +0000, Jason Baron wrote: > It's more complicated - MIPS was using the global default with five MIPS > platforms overriding the default. > > I propose to kill these overrides for sanity unless somebody comes up > with a good argument. Patch below. > > Ralf > > Signed-off-by: Ralf Baechle <ralf@linux-mips.org> > > arch/mips/ar7/setup.c | 1 - > arch/mips/emma/markeins/setup.c | 3 --- > arch/mips/netlogic/xlp/setup.c | 1 - > arch/mips/netlogic/xlr/setup.c | 1 - > arch/mips/sibyte/swarm/setup.c | 2 -- > 5 files changed, 8 deletions(-) [...] > diff --git a/arch/mips/emma/markeins/setup.c b/arch/mips/emma/markeins/setup.c > index d710058..9100122 100644 > --- a/arch/mips/emma/markeins/setup.c > +++ b/arch/mips/emma/markeins/setup.c > @@ -111,9 +111,6 @@ void __init plat_mem_setup(void) > iomem_resource.start = EMMA2RH_IO_BASE; > iomem_resource.end = EMMA2RH_ROM_BASE - 1; > > - /* Reboot on panic */ > - panic_timeout = 180; > - > markeins_sio_setup(); > } >
IIRC we had set it to 180 seconds for some historical reasons, but I'm afraid nobody can recall the reason why it's set so in 2013... Anyway I was thinking it too long and reduced to a few seconds locally when debugging, so there shouldn't be a problem with this change.
FWIW, for EMMA2RH portion:
Acked-by: Shinya Kuribayashi <skuribay@pobox.com>
Thank you always for your help, Ralf.
| |