2 files changed, 3 insertions, 1 deletions

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 80119b3398e7..5c9cbfc14c4d 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -55,6 +55,8 @@ config GENERIC_HARDIRQS
 
 config GENERIC_HARDIRQS_NO__DO_IRQ
         def_bool y
+        depends on SUPERH32 && (!SH_DREAMCAST && !SH_SH4202_MICRODEV && \
+                                !SH_7751_SYSTEMH && !HD64461)
 
 config GENERIC_IRQ_PROBE
         def_bool y
diff --git a/drivers/sh/maple/maple.c b/drivers/sh/maple/maple.c
index d1812d32f47d..63f0de29aa14 100644
--- a/drivers/sh/maple/maple.c
+++ b/drivers/sh/maple/maple.c
@@ -827,7 +827,7 @@ static int __init maple_bus_init(void)
 
         maple_queue_cache =
             kmem_cache_create("maple_queue_cache", 0x400, 0,
-                              SLAB_POISON|SLAB_HWCACHE_ALIGN, NULL);
+                              SLAB_HWCACHE_ALIGN, NULL);
 
         if (!maple_queue_cache)
                 goto cleanup_bothirqs;