Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1564067

Re: [tip:timers/core] x86/timer: Make delay() during early bootup

Show all headers | View raw

On 01/20/2017, 03:40 PM, tip-bot for Jiri Slaby wrote:
> Commit-ID:  bf3304d996fbb993bad6be09cafde39cc2db72bb
> Gitweb:     http://git.kernel.org/tip/bf3304d996fbb993bad6be09cafde39cc2db72bb
> Author:     Jiri Slaby <jslaby@suse.cz>
> AuthorDate: Thu, 19 Jan 2017 12:47:30 +0100
> Committer:  Ingo Molnar <mingo@kernel.org>
> CommitDate: Fri, 20 Jan 2017 09:45:22 +0100
> 
> x86/timer: Make delay() during early bootup
> 
> When a panic happens during bootup, "Rebooting in X seconds.." is
> shown, but reboot happens immediatelly. It is because panic() uses mdelay()
> and mdelay() calls __const_udelay() immediately, which is does not
> work while booting.

The 'is' is superfluous after your edit now. But I guess, you cannot
change it given it is in the tree.

> --- a/arch/x86/lib/delay.c
> +++ b/arch/x86/lib/delay.c
> @@ -156,13 +156,13 @@ EXPORT_SYMBOL(__delay);
>  
>  inline void __const_udelay(unsigned long xloops)
>  {
> +	unsigned long lpj = this_cpu_read(cpu_info.loops_per_jiffy) ? : loops_per_jiffy;

And thanks for fixing the 'lpf' brain damage :).

-- 
js
suse labs

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH] x86: make delay work in earlier stages Jiri Slaby <jslaby@suse.cz> - 2017-01-19 13:10 +0100
  Re: [PATCH] x86: make delay work in earlier stages Andy Shevchenko <andy.shevchenko@gmail.com> - 2017-01-19 20:10 +0100
  [tip:timers/core] x86/timer: Make delay() during early bootup tip-bot for Jiri Slaby <tipbot@zytor.com> - 2017-01-20 15:50 +0100
    Re: [tip:timers/core] x86/timer: Make delay() during early bootup Jiri Slaby <jslaby@suse.cz> - 2017-01-21 08:40 +0100
  [tip:timers/core] x86/timer: Make delay() work during early bootup tip-bot for Jiri Slaby <tipbot@zytor.com> - 2017-01-22 10:20 +0100

csiph-web