From patchwork Wed Feb 28 19:17:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 10249367 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E40B060211 for ; Wed, 28 Feb 2018 19:18:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CCEAB2870B for ; Wed, 28 Feb 2018 19:18:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C17FE28809; Wed, 28 Feb 2018 19:18:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C68822870B for ; Wed, 28 Feb 2018 19:18:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933352AbeB1TSQ (ORCPT ); Wed, 28 Feb 2018 14:18:16 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:55083 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932780AbeB1TSP (ORCPT ); Wed, 28 Feb 2018 14:18:15 -0500 Received: by mail-wm0-f68.google.com with SMTP id z81so7103682wmb.4 for ; Wed, 28 Feb 2018 11:18:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rasmusvillemoes.dk; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=GbDO4MniycILrwvkum6b6fDHKbBvZLm71MZI9FoyV8s=; b=cA3nhr7erQV8OjviVTFDxKTJYxC/VsX+TG0opjhrcg8ZhWx1ApZe8FlJndG26XpOxr j6JUmV49/8aJ0IrEeGdelr0zKoB3IZkd7Vam1rMyGWSdvwy2nv4aomG4pEid4GP+u2PA 4bGNQQWPdS3/WcLYqAKAlNh7rnpT6/8ipugs4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=GbDO4MniycILrwvkum6b6fDHKbBvZLm71MZI9FoyV8s=; b=MVc2o/Gu+tjlGU7w21z1QjQD61D+k0sIMi3xOjhv0KoJriMLkAbZHeAOEIQXK0dYKR 8jDONnfIPgUaePasNV8QOW8TTGrsWc/2/sVMmswXLVBWS56zlGiaOVE/SqTzamj9a8sQ hCKx79cvdWJeYMe2APz6B1kEkZTAS+TysXI8dYCQ7walfZ7g6Q3jCSKvPiXH5ygY3Q5C o4AbDCe7PgU1Srq1MOKTgbnT68Tbvegw9QAAIgPOsUEqdYtQk1OI9PwnI2bjniW1HDmV 9fVeT8zC+OzGAj+ygm+yPO9paQN7+nwSN6mbuFDFr6htj3AxWC0kicyBoQVOdpMnxa9z OWgA== X-Gm-Message-State: APf1xPAmsthly2fhCldiQkYx6xAUBDsrimqvXERtQR/febTx0TrDxmci 2/LiUli5X6SMBViACSmFO61y8g== X-Google-Smtp-Source: AH8x227hijezH83ayN5JUahyV+SJM/xUomOkSHNDv3jCzCdOL9H8dYBFGmWDbj5mnhko7htnQ65NKQ== X-Received: by 10.80.202.75 with SMTP id e11mr23988448edi.32.1519845493668; Wed, 28 Feb 2018 11:18:13 -0800 (PST) Received: from prevas-ravi.waoo.dk (dhcp-5-186-126-104.cgn.ip.fibianet.dk. [5.186.126.104]) by smtp.gmail.com with ESMTPSA id l60sm2063613edl.56.2018.02.28.11.18.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 28 Feb 2018 11:18:12 -0800 (PST) From: Rasmus Villemoes To: Masahiro Yamada , Michal Marek Cc: Rasmus Villemoes , Al Viro , Richard Weinberger , user-mode-linux-devel@lists.sourceforge.net, linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] fixdep: remove stale references to uml-config.h Date: Wed, 28 Feb 2018 20:17:35 +0100 Message-Id: <20180228191805.20094-1-linux@rasmusvillemoes.dk> X-Mailer: git-send-email 2.15.1 In-Reply-To: References: Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP uml-config.h hasn't existed in this decade (87e299e5c750 - x86, um: get rid of uml-config.h). The few remaining UML_CONFIG instances are defined directly in terms of their real CONFIG symbol in common-offsets.h, so unlike when the symbols got defined via a sed script, anything that uses UML_CONFIG_FOO now should also automatically pick up a dependency on CONFIG_FOO via the normal fixdep mechanism (since common-offsets.h should at least recursively be a dependency). Hence I believe we should actually be able to ignore the HELLO_CONFIG_BOOM cases. Cc: Al Viro Cc: Richard Weinberger Cc: user-mode-linux-devel@lists.sourceforge.net Signed-off-by: Rasmus Villemoes --- scripts/basic/fixdep.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c index fa3d39b6f23b..d7fbe545dd5d 100644 --- a/scripts/basic/fixdep.c +++ b/scripts/basic/fixdep.c @@ -93,14 +93,6 @@ * (Note: it'd be easy to port over the complete mkdep state machine, * but I don't think the added complexity is worth it) */ -/* - * Note 2: if somebody writes HELLO_CONFIG_BOOM in a file, it will depend onto - * CONFIG_BOOM. This could seem a bug (not too hard to fix), but please do not - * fix it! Some UserModeLinux files (look at arch/um/) call CONFIG_BOOM as - * UML_CONFIG_BOOM, to avoid conflicts with /usr/include/linux/autoconf.h, - * through arch/um/include/uml-config.h; this fixdep "bug" makes sure that - * those files will have correct dependencies. - */ #include #include @@ -286,7 +278,6 @@ static int is_ignored_file(const char *s, int len) { return str_ends_with(s, len, "include/generated/autoconf.h") || str_ends_with(s, len, "include/generated/autoksyms.h") || - str_ends_with(s, len, "arch/um/include/uml-config.h") || str_ends_with(s, len, "include/linux/kconfig.h") || str_ends_with(s, len, ".ver"); }