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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 37791C4332F for ; Tue, 18 Oct 2022 00:51:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230140AbiJRAvL (ORCPT ); Mon, 17 Oct 2022 20:51:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44786 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229683AbiJRAvJ (ORCPT ); Mon, 17 Oct 2022 20:51:09 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EC82679A5C for ; Mon, 17 Oct 2022 17:51:07 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 9B195B81C03; Tue, 18 Oct 2022 00:11:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 81CFAC43140; Tue, 18 Oct 2022 00:11:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1666051901; bh=0WRq8MXZM3ZDilDA1bAGWB/EzA7Q30P8KMT3E0nCaJQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=evA4cU4epHX1lhJw77wBPzgw+GF3zWLNGxL6/sAVkGPkOkj9gP2uDbgzsF/z0TtdI +iHmWTnr0gwSPdkCz1YmAEiNU2VPDvu4p5TSEF5WWFqpETLtGk00qSYFTjp+FG9qgn 2YLKJKAjPtlBEVxBSiPUrdiDcxnGytPsjI/XCKEo3GYJnIzJV3V8I4u2inh0Jsr0Ok tq/1Oz4hke9fxnA2JlLk5hPmJLdIzeQgki+Vfw0SiTHoc5O2LGvnpC9yLai1PtBjL8 KKfrYD+kq969zYiW46tCdkv/ZyzUHdBBlD2/QCNeOVx4s2/2OpNhfyDTTVNCMLpsH6 OPqSV1kf6+YSw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Greg Ungerer , kernel test robot , Geert Uytterhoeven , Sasha Levin , linux-m68k@lists.linux-m68k.org Subject: [PATCH AUTOSEL 4.19 06/10] m68knommu: fix non-specific 68328 choice interrupt build failure Date: Mon, 17 Oct 2022 20:11:24 -0400 Message-Id: <20221018001128.2732162-6-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221018001128.2732162-1-sashal@kernel.org> References: <20221018001128.2732162-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-m68k@vger.kernel.org From: Greg Ungerer [ Upstream commit 750321ace9107e103f254bf46900629ff347eb7b ] Compiling for a classic m68k non-MMU target with no specific CPU selected fails with the following error: arch/m68k/68000/ints.c: In function 'process_int': >> arch/m68k/68000/ints.c:82:30: error: 'ISR' undeclared (first use in this function) 82 | unsigned long pend = ISR; | ^~~ This interrupt handling code is specific to the 68328 family of 68000 parts. There is a couple of variants (68EZ328, 68VZ328) and the common ancestor of them the strait 68328. The code here includes a specific header for each variant type. But if none is selected then nothing is included to supply the appropriate register and bit flags defines. Rearrange the includes so that at least one type is always included. At the very least the 68328 base type should be the fallback, so make that true. Reported-by: kernel test robot Reviewed-by: Geert Uytterhoeven Signed-off-by: Greg Ungerer Signed-off-by: Sasha Levin --- arch/m68k/68000/ints.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/m68k/68000/ints.c b/arch/m68k/68000/ints.c index cda49b12d7be..f9a5ec781408 100644 --- a/arch/m68k/68000/ints.c +++ b/arch/m68k/68000/ints.c @@ -18,12 +18,12 @@ #include #include -#if defined(CONFIG_M68328) -#include -#elif defined(CONFIG_M68EZ328) +#if defined(CONFIG_M68EZ328) #include #elif defined(CONFIG_M68VZ328) #include +#else +#include #endif /* assembler routines */ -- 2.35.1