From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.0 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0CB4BC433E3 for ; Wed, 15 Jul 2020 15:17:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E43B420658 for ; Wed, 15 Jul 2020 15:17:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725977AbgGOPRt (ORCPT ); Wed, 15 Jul 2020 11:17:49 -0400 Received: from mail-oo1-f65.google.com ([209.85.161.65]:41830 "EHLO mail-oo1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725798AbgGOPRt (ORCPT ); Wed, 15 Jul 2020 11:17:49 -0400 Received: by mail-oo1-f65.google.com with SMTP id z23so532764ood.8; Wed, 15 Jul 2020 08:17:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=07w6zT5p/JCkvgft7yXEC/Da1EqLXDyJjPcjdIL2ruY=; b=KoMvZJ1RW4uWbsZKFZ9bC1+dI5SSa8lqHPWx75S0zYDU89uIOn06moxwurD+92arSZ zGVnhrSKaCuVkLJ59DWZiDJ/eX9/xipW2zQ0GCsKdb4iJn4G+OblwNVorj3baaFGzrmW fBPRalF9btvo4Kl1ad7+PLRMArDaHrRHSERVR6QSWnz7DJhAiKQfUpDAWiBuFjnhq5zk +QVBy1+GLKJ0wpGrfLBNApN7aG9EwNIwAOXKLK/SguCgcxVnw4B2udohI74kwz+1cuxX yTGfkHK6oDzfBIjvOKzjUpQ5kqwVRQj3GlB1EfLUDB9JsnDGn1OVruIgDfAmmG18hfEQ kTtQ== X-Gm-Message-State: AOAM530FqIOrvxhWTC+rUVbJ25PhboNH3dIP6yttCfPcGVvpKqBMETF5 9bWOMkf7uRIrsYsxNP+yNsYF7kHe2ab/I3WSZ/LtpFLTSb0= X-Google-Smtp-Source: ABdhPJzcvtdOKs6/rlkfC19wWNicku4ArAC1wkLz5s5+/Yr9O9b5VZw4xWj+dHNs3IyqCFesO3GORRMCWTrweiBD89g= X-Received: by 2002:a4a:5209:: with SMTP id d9mr9977302oob.40.1594826268060; Wed, 15 Jul 2020 08:17:48 -0700 (PDT) MIME-Version: 1.0 References: <20200715121423.6c20731b@canb.auug.org.au> <6bc36827-83a7-3695-530d-4b90c08b92c7@kernel.dk> In-Reply-To: <6bc36827-83a7-3695-530d-4b90c08b92c7@kernel.dk> From: Geert Uytterhoeven Date: Wed, 15 Jul 2020 17:17:36 +0200 Message-ID: Subject: Re: linux-next: build failure after merge of the block tree To: Jens Axboe Cc: Stephen Rothwell , Linux Next Mailing List , Linux Kernel Mailing List Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Jens, On Wed, Jul 15, 2020 at 5:08 PM Jens Axboe wrote: > On 7/15/20 3:24 AM, Geert Uytterhoeven wrote: > > On Wed, Jul 15, 2020 at 4:26 AM Stephen Rothwell wrote: > >> 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. > > > > (as I don't have the original patch in my email, I'm commenting here) > > > > +config HZ_ROUGH_MASK > > + int > > + default 127 if HZ_100 > > + default 255 if HZ_250 || HZ_300 > > + default 1023 if HZ_1000 > > > > What about other HZ_* values? > > Which other ones do we have? $ git grep "\