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 90EC5ECAAA6 for ; Fri, 26 Aug 2022 04:03:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233019AbiHZEDq (ORCPT ); Fri, 26 Aug 2022 00:03:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39316 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232257AbiHZEDp (ORCPT ); Fri, 26 Aug 2022 00:03:45 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C960EA0330 for ; Thu, 25 Aug 2022 21:03:44 -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 68819B82958 for ; Fri, 26 Aug 2022 04:03:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2DA0FC433D6; Fri, 26 Aug 2022 04:03:39 +0000 (UTC) From: Greg Ungerer To: linux-m68k@vger.kernel.org Cc: Greg Ungerer , kernel test robot Subject: [PATCH 1/3] m68knommu: fix non-specific 68328 choice interrupt build failure Date: Fri, 26 Aug 2022 14:03:00 +1000 Message-Id: <20220826040302.3455339-1-gerg@linux-m68k.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-m68k@vger.kernel.org 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 Signed-off-by: Greg Ungerer --- 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.25.1