Skip to content

Commit 750321a

Browse files
author
Greg Ungerer
committed
m68knommu: fix non-specific 68328 choice interrupt build failure
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 <[email protected]> Reviewed-by: Geert Uytterhoeven <[email protected]> Signed-off-by: Greg Ungerer <[email protected]>
1 parent f76349c commit 750321a

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

arch/m68k/68000/ints.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
#include <asm/io.h>
1919
#include <asm/machdep.h>
2020

21-
#if defined(CONFIG_M68328)
22-
#include <asm/MC68328.h>
23-
#elif defined(CONFIG_M68EZ328)
21+
#if defined(CONFIG_M68EZ328)
2422
#include <asm/MC68EZ328.h>
2523
#elif defined(CONFIG_M68VZ328)
2624
#include <asm/MC68VZ328.h>
25+
#else
26+
#include <asm/MC68328.h>
2727
#endif
2828

2929
/* assembler routines */

0 commit comments

Comments
 (0)