Re: linux-next: build failure after merge of the block tree

Jens Axboe
2020-05-14T14:07:01Z

On 5/14/20 2:57 AM, Stephen Rothwell wrote:
> Hi all,
>
> After merging the block tree, today's linux-next build (x86_64
> allnoconfig) failed like this:
>
> In file included from include/linux/blk-cgroup.h:23,
> from include/linux/writeback.h:14,
> from include/linux/memcontrol.h:22,
> from include/linux/swap.h:9,
> from include/linux/suspend.h:5,
> from arch/x86/kernel/asm-offsets.c:13:
> include/linux/blkdev.h: In function 'blk_io_schedule':
> include/linux/blkdev.h:1857:26: error: 'sysctl_hung_task_timeout_secs' undeclared (first use in this function)
> 1857 | unsigned long timeout = sysctl_hung_task_timeout_secs * HZ / 2;
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>
> Caused by commit
>
> e6249cdd46e4 ("block: add blk_io_schedule() for avoiding task hung in sync dio")
>
> linux/sched/sysctl.h was not included since CONFIG_BLOCK is not defined.
> I have applied the following patch for today.

Sorry about that, it's fixed in the current tree.

--
Jens Axboe