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

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi all,

After merging the block tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

block/blk-timeout.c: In function 'blk_round_jiffies':
block/blk-timeout.c:96:14: error: 'CONFIG_HZ_ROUGH_MASK' undeclared (first use in this function)
   96 |  return (j + CONFIG_HZ_ROUGH_MASK) + 1;
      |              ^~~~~~~~~~~~~~~~~~~~

Caused by commit

  91ba0f529364 ("block: relax jiffies rounding for timeouts")

CONFIG_HZ_ROUGH_MASK is not defined for this build even though
CONFIG_HZ_100 is set. The arm arch does not include kernel/Kconfig.hz.

I have reverted that commit for today.

-- 
Cheers,
Stephen Rothwell

Attachment: pgp52LA9KpqWb.pgp
Description: OpenPGP digital signature