1 files changed, 6 insertions, 2 deletions

diff --git a/arch/arm/kernel/pj4-cp0.c b/arch/arm/kernel/pj4-cp0.c
index fc7208636284..12352cd30ab2 100644
--- a/arch/arm/kernel/pj4-cp0.c
+++ b/arch/arm/kernel/pj4-cp0.c
@@ -45,7 +45,7 @@ static int iwmmxt_do(struct notifier_block *self, unsigned long cmd, void *t)
         return NOTIFY_DONE;
 }
 
-static struct notifier_block iwmmxt_notifier_block = {
+static struct notifier_block __maybe_unused iwmmxt_notifier_block = {
         .notifier_call  = iwmmxt_do,
 };
 
@@ -79,17 +79,21 @@ static void __init pj4_cp_access_write(u32 value)
  */
 static int __init pj4_cp0_init(void)
 {
-        u32 cp_access;
+        u32 __maybe_unused cp_access;
 
         if (!cpu_is_pj4())
                 return 0;
 
+#ifndef CONFIG_IWMMXT
+        pr_info("PJ4 iWMMXt coprocessor detected, but kernel support is missing.\n");
+#else
         cp_access = pj4_cp_access_read() & ~0xf;
         pj4_cp_access_write(cp_access);
 
         printk(KERN_INFO "PJ4 iWMMXt coprocessor enabled.\n");
         elf_hwcap |= HWCAP_IWMMXT;
         thread_register_notifier(&iwmmxt_notifier_block);
+#endif
 
         return 0;
 }