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@xxxxxxx>
> AuthorDate: Thu, 19 Jan 2017 12:47:30 +0100
> Committer: Ingo Molnar <mingo@xxxxxxxxxx>
> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|