Merge branch 'linus' into tracing-v28-for-linus-v3

Conflicts:
	init/main.c
	kernel/module.c
	scripts/bootgraph.pl

1 files changed, 2 insertions, 4 deletions

diff --git a/arch/m68k/atari/ataints.c b/arch/m68k/atari/ataints.c
index b45593a60bdd..dba4afabb444 100644
--- a/arch/m68k/atari/ataints.c
+++ b/arch/m68k/atari/ataints.c
@@ -407,10 +407,8 @@ void __init atari_init_IRQ(void)
                  * gets overruns)
                  */
 
-                if (!MACH_IS_HADES) {
-                        vectors[VEC_INT2] = falcon_hblhandler;
-                        vectors[VEC_INT4] = falcon_hblhandler;
-                }
+                vectors[VEC_INT2] = falcon_hblhandler;
+                vectors[VEC_INT4] = falcon_hblhandler;
         }
 
         if (ATARIHW_PRESENT(PCM_8BIT) && ATARIHW_PRESENT(MICROWIRE)) {