Received: by 2002:a25:b323:0:0:0:0:0 with SMTP id l35csp3082605ybj; Mon, 23 Sep 2019 14:30:56 -0700 (PDT) X-Google-Smtp-Source: APXvYqw3KYyKOF3WXmoTSqqhxRbqhJ7gmQOzNzuwfdrupeOF5vDgCtpSeCy/yPDJ7a0EY9Bg2U0t X-Received: by 2002:a50:f04e:: with SMTP id u14mr2279827edl.247.1569274256642; Mon, 23 Sep 2019 14:30:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569274256; cv=none; d=google.com; s=arc-20160816; b=ROuwihLrt5HOdDkBo+swHLEXYn8TmdDsEiky0b0DC7LlKEUfEiePk5BnsU3vlB+Dg9 Evif1aK/CRjHAKk8/hBnPQDs5NmaIstQCkF4TB8Jy2QbThdcTO7GVncThx/iqYVSpV/1 fIuIF69a0WpZ8+8NUN5N11yl5ho0d13q684/DG/77JW+A6aFvP7W1WpzCJFuGtY9XiTr qUOC1ja2M0P2+aL6aDPt+2+krR1Bgkkq2+xkzsSFSLX2zv11OzPVtKyaib49RvPt5Pvo FaitH7+o7KcdfT8DtuiuibaQT66eCroyA0EvntJPBwucqD803QLNDngExw+Q5qa7kqEJ vVGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Nj2Spa4X5XihY0WQv6Tur6iJqVvcAULv6XC+ZwoJ5tA=; b=kdN0popdYjMO7gXZzMvovVDX6l4VnbDGA4CDIzgMvViMAXn5W7J+axdaTiRLcrDxbZ ZF0r/B4sYqVbdwohCuKTIR1yLrzvWO1ftcNAI7r1NzH5GVHHoghSgBMtXQJMaQo9S4IX vP5sfYjZqlz071alCCzYUKZTG7hbKF4ZtE6npc3EfHVyO64+V8fgDS6ORltmNXNkLInk R0Bz+v2tla/nMarV2d1ABB4kPDvSMWcG37Boi46LjYT9Rei+U0JLlOcl3dSDfahrIWrF E464iCFlxXbRSbzczR5S12oT567LMEXz7h7oTejtnuWekLBOCdCeH2LWmiz/U14HWI5i n0Zg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=eZk0IM6M; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o21si5773189ejr.208.2019.09.23.14.30.31; Mon, 23 Sep 2019 14:30:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=eZk0IM6M; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389643AbfIVSpy (ORCPT + 99 others); Sun, 22 Sep 2019 14:45:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:41602 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389398AbfIVSpv (ORCPT ); Sun, 22 Sep 2019 14:45:51 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 257CE208C2; Sun, 22 Sep 2019 18:45:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569177950; bh=CiyScJoSbjEh1dk6sz0/OoVDGfhZZEA9aBDwuupZISg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eZk0IM6MlZWnejsLOTihBFvyinJpeZBFn9Asjxeyq2CCoGWgh3g9YU0MK7m50OTzL yizhyijHi/0ZsYqnPEEzWrz5TthwnQdVL+axShQN2Yj2WzYRDBYyJXBbSFBvLtRJKf 2yzsFyw3qZker2EFFzPVZadEAg/mzQZ+vs4RUkw4= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Valdis Kletnieks , kbuild test robot , Borislav Petkov , Tony Luck , linux-edac@vger.kernel.org, x86@kernel.org, Sasha Levin , linux-riscv@lists.infradead.org Subject: [PATCH AUTOSEL 5.3 056/203] RAS: Build debugfs.o only when enabled in Kconfig Date: Sun, 22 Sep 2019 14:41:22 -0400 Message-Id: <20190922184350.30563-56-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922184350.30563-1-sashal@kernel.org> References: <20190922184350.30563-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Valdis Kletnieks [ Upstream commit b6ff24f7b5101101ff897dfdde3f37924e676bc2 ] In addition, the 0day bot reported this build error: >> drivers/ras/debugfs.c:10:5: error: redefinition of 'ras_userspace_consumers' int ras_userspace_consumers(void) ^~~~~~~~~~~~~~~~~~~~~~~ In file included from drivers/ras/debugfs.c:3:0: include/linux/ras.h:14:19: note: previous definition of 'ras_userspace_consumers' was here static inline int ras_userspace_consumers(void) { return 0; } ^~~~~~~~~~~~~~~~~~~~~~~ for a riscv-specific .config where CONFIG_DEBUG_FS is not set. Fix all that by making debugfs.o depend on that define. [ bp: Rewrite commit message. ] Reported-by: kbuild test robot Signed-off-by: Valdis Kletnieks Signed-off-by: Borislav Petkov Cc: Tony Luck Cc: linux-edac@vger.kernel.org Cc: x86@kernel.org Link: http://lkml.kernel.org/r/7053.1565218556@turing-police Signed-off-by: Sasha Levin --- drivers/ras/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/ras/Makefile b/drivers/ras/Makefile index ef6777e14d3df..6f0404f501071 100644 --- a/drivers/ras/Makefile +++ b/drivers/ras/Makefile @@ -1,3 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only -obj-$(CONFIG_RAS) += ras.o debugfs.o +obj-$(CONFIG_RAS) += ras.o +obj-$(CONFIG_DEBUG_FS) += debugfs.o obj-$(CONFIG_RAS_CEC) += cec.o -- 2.20.1