From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x226W6i9U5eIjix5ZBXRtOnDat+kzW1u3eh3uq3o9aK+GZaG1XAlcogiLgcAw1jseWELEsZAU ARC-Seal: i=1; a=rsa-sha256; t=1518709134; cv=none; d=google.com; s=arc-20160816; b=e2GzfE3DhILrZY/Jqn5IqmT3vESOTU2UuNpF/vSm/XYnB9yVK9GMNneTFUrB8eBF0N 7ekPdVWRyz4WFWtkfTaCU4SbwMZCLx92K8nfxStW0YUqniZLkVmAPmLt5vIKLraU5wJZ 8Lp7jOKamKY/e9DL0u0gwQGa3griiG5pbr0mH8L8dMDuV3JByAAGIxsHNJ5tMo85R8AT x81cVo+Z7khnVBDsLWWTr4z0mUWorlexSnfwl6Me9NQVLZ0y4h8dBqgMlsgf8eASwoGw 8rQXVyDmrYVl2QJoYEPki0W5uqqA04Ov427aI/rlpO0FhY4FR9OUonS0aur7wr8G1y15 GnGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=6LTI8ohLR1/Ey5d8D6pR53s9k3J7pnfbOKCkdvjCbEs=; b=NmlxSvBfK9Hele/Xyy2lKDMTrdGAeTtLOo1pdaL3UPO5PjH+cBhJ1K6DCoZPTpIgzd yhiygtMyJUcI6/5UH4ZGVSCWXJSUlw06k7hEFcp3mKqCTxzldQbsMMq+XWIemtjWSJha jGmu6Gg2KgVOviwQ6JpprmRH2xYnfJaZYv6EZGu15uGJMW97DPTzcIzDlnlr7/gN4NZO Y8slhnGyxAJiogtlQb4m5vtzLAmqjR9HI67rgg9Ch4YoWSfWbNNJsPcOTJMDLn/vO88F y8rXFYmciTZwU0DAjhdamAFFVJMw7bxgreQeu6uEjrozEVTFEccOexZIbpfWz4bKiZYu xqHA== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Matt Redfearn , Ralf Baechle , James Hogan , Guenter Roeck , Wim Van Sebroeck Subject: [PATCH 4.15 001/202] watchdog: indydog: Add dependency on SGI_HAS_INDYDOG Date: Thu, 15 Feb 2018 16:15:01 +0100 Message-Id: <20180215151712.836771613@linuxfoundation.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180215151712.768794354@linuxfoundation.org> References: <20180215151712.768794354@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1592481380463922372?= X-GMAIL-MSGID: =?utf-8?q?1592481950270563395?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Matt Redfearn commit 24f8d233074badd4c18e4dafd2fb97d65838afed upstream. Commit da2a68b3eb47 ("watchdog: Enable COMPILE_TEST where possible") enabled building the Indy watchdog driver when COMPILE_TEST is enabled. However, the driver makes reference to symbols that are only defined for certain platforms are selected in the config. These platforms select SGI_HAS_INDYDOG. Without this, link time errors result, for example when building a MIPS allyesconfig. drivers/watchdog/indydog.o: In function `indydog_write': indydog.c:(.text+0x18): undefined reference to `sgimc' indydog.c:(.text+0x1c): undefined reference to `sgimc' drivers/watchdog/indydog.o: In function `indydog_start': indydog.c:(.text+0x54): undefined reference to `sgimc' indydog.c:(.text+0x58): undefined reference to `sgimc' drivers/watchdog/indydog.o: In function `indydog_stop': indydog.c:(.text+0xa4): undefined reference to `sgimc' drivers/watchdog/indydog.o:indydog.c:(.text+0xa8): more undefined references to `sgimc' follow make: *** [Makefile:1005: vmlinux] Error 1 Fix this by ensuring that CONFIG_INDIDOG can only be selected when the necessary dependent platform symbols are built in. Fixes: da2a68b3eb47 ("watchdog: Enable COMPILE_TEST where possible") Signed-off-by: Matt Redfearn Signed-off-by: Ralf Baechle Suggested-by: James Hogan Reviewed-by: Guenter Roeck Signed-off-by: Guenter Roeck Signed-off-by: Wim Van Sebroeck Signed-off-by: Greg Kroah-Hartman --- drivers/watchdog/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -1451,7 +1451,7 @@ config RC32434_WDT config INDYDOG tristate "Indy/I2 Hardware Watchdog" - depends on SGI_HAS_INDYDOG || (MIPS && COMPILE_TEST) + depends on SGI_HAS_INDYDOG help Hardware driver for the Indy's/I2's watchdog. This is a watchdog timer that will reboot the machine after a 60 second