Received: by 2002:a25:e74b:0:0:0:0:0 with SMTP id e72csp531354ybh; Wed, 15 Jul 2020 08:23:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx48BFVbY6VDUjDnej7IltgYL83BfrLzakyZPbrCLgqFoE4dUopu+2cbmCoqVKgT48wGtDb X-Received: by 2002:a05:6402:1b1c:: with SMTP id by28mr135255edb.270.1594826588017; Wed, 15 Jul 2020 08:23:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594826588; cv=none; d=google.com; s=arc-20160816; b=0YBjb7YLAvjCiTOilDVEJoUfObUhPElBK7se35QX1mOnwIkR7Z4t8shN63kET0QYg/ ppFWXv/oMGyiXZSO/KmT+uCFeVX4tP32JtpMHzMtm78R29oGDai2Rw/Y8ODbJ0/0+rp7 D4njZkjlzJ1WxP3KZDt8ypgJBitLPdiZjhqx1RSbUOTCHAvLn6yoZ0a81o1hrh6KNOJW hWfawfC956YGik5+l9KdrPDKcx4Z+G99ZTh74bwdgQdHiHnIVK8UV1UuxHBn6g27OL/S BUufK0EfiwpJS55aUgQ3ZR5yDOkRmvK8LnlxBIPFGBkdA9QTcRQJchbmacXZ49Np0XaW hvAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version; bh=Rsv1c9eB/tCtTHdeCJGRATFVUgVys8lI2UmJmc98OKo=; b=rxqQ5Q69nIvoIBijBaqytZvczhk8lNCZVLAYCYHocUv4bHQX4tZuEcJVoATTq7gLxY B1xHervORC5FY7rPyE0AGZ0JYIcpJv7oFyLEfFaUJrs+gKXG7B779M/vRiKTZx0/VHX5 kozmiGplIuh1arcjOZqqLtq/mMxGf/ZdC+T1FWCgN42rZPPmmBHaQv8weQMunXCiVLdn 2g/JCAWryx5DkvBMhShfBDOiQf+CPpdgbPeOYaEI1LTwzNZYBEO8a9YbiLGem1myyrRE oScNn7KELSCe1R+Y3VZYfmKlIAFI0Y0fQhteNnRAMdjU0FiiwhjKh/TOXsXI6DVnxOTj Bp8w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y19si1566090eje.56.2020.07.15.08.22.45; Wed, 15 Jul 2020 08:23:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725909AbgGOPWY (ORCPT + 99 others); Wed, 15 Jul 2020 11:22:24 -0400 Received: from mail-ot1-f68.google.com ([209.85.210.68]:39920 "EHLO mail-ot1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725798AbgGOPWY (ORCPT ); Wed, 15 Jul 2020 11:22:24 -0400 Received: by mail-ot1-f68.google.com with SMTP id 18so1745877otv.6; Wed, 15 Jul 2020 08:22:23 -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=Rsv1c9eB/tCtTHdeCJGRATFVUgVys8lI2UmJmc98OKo=; b=NDoDhSZ7vwnugKj/p3+OHoA8j/JBKo38XOEnT1cy/nbsadMsDag8IKKNC/w8Q/obdA u/wm898H85ePCaYVTg8XMqB4EgAppDik5quncndr8TtqdyQ+pScUR8s3hkSd3xzXqVKC bR/8dHApqTws2T8ICCioo76rAMSXB8lHUHwkebV+XkWVsX95aYOP7JVGoxiU+N7iqRlP 2vpcJDOZb4/6Qu+8433INkrLMxMsMtklc4RHVJENM6YEdxRQk1nHbLvI6nS3P2F04LrE N1gCpmLlJvRH6XaFEOBioo3oXKMHAQd52IWwhFzFmc8XN3oZEpTlwokmf+seZJ+f2L9u jcyg== X-Gm-Message-State: AOAM530vfM2VLQYKMuEt5zqfqbzcFns+Dj5l+kV0EYhJegT7Asjg8qMl 3eaoFNMPaUQCisSnp0Db6mZe1iMI7fFeH9vQSvVSllL7TlQ= X-Received: by 2002:a9d:1b0d:: with SMTP id l13mr117304otl.145.1594826542998; Wed, 15 Jul 2020 08:22:22 -0700 (PDT) MIME-Version: 1.0 References: <20200715121423.6c20731b@canb.auug.org.au> <6bc36827-83a7-3695-530d-4b90c08b92c7@kernel.dk> In-Reply-To: From: Geert Uytterhoeven Date: Wed, 15 Jul 2020 17:22:11 +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 "\ arch/alpha/Kconfig: default HZ_128 if ALPHA_QEMU > arch/alpha/Kconfig: default HZ_1200 if ALPHA_RAWHIDE > arch/alpha/Kconfig: default HZ_1024 And ARC allows you to enter any integer value: config HZ int "Timer Frequency" default 100 So probably you want to derive something from the integer value itself. Note that not all architectures include kernel/Kconfig.hz. Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds