Merge branches 'core-fixes-for-linus', 'irq-fixes-for-linus' and 'timers-fixes-for...

[mv-sheeva.git] / arch / sh / kernel / io_trapped.c

diff --git a/arch/sh/kernel/io_trapped.c b/arch/sh/kernel/io_trapped.c
index 227547bae54891775e26739efeaffa6352c85348..c22853b059efd118528cbff82a02b399412add8c 100644 (file)
--- a/arch/sh/kernel/io_trapped.c
+++ b/arch/sh/kernel/io_trapped.c
@@ -13,6 +13,8 @@
 #include <linux/mm.h>
 #include <linux/bitops.h>
 #include <linux/vmalloc.h>
+#include <linux/module.h>
+#include <linux/init.h>
 #include <asm/system.h>
 #include <asm/mmu_context.h>
 #include <asm/uaccess.h>
@@ -23,19 +25,33 @@
 
 #ifdef CONFIG_HAS_IOPORT
 LIST_HEAD(trapped_io);
+EXPORT_SYMBOL_GPL(trapped_io);
 #endif
 #ifdef CONFIG_HAS_IOMEM
 LIST_HEAD(trapped_mem);
+EXPORT_SYMBOL_GPL(trapped_mem);
 #endif
 static DEFINE_SPINLOCK(trapped_lock);
 
-int __init register_trapped_io(struct trapped_io *tiop)
+static int trapped_io_disable __read_mostly;
+
+static int __init trapped_io_setup(char *__unused)
+{
+       trapped_io_disable = 1;
+       return 1;
+}
+__setup("noiotrap", trapped_io_setup);
+
+int register_trapped_io(struct trapped_io *tiop)
 {
        struct resource *res;
        unsigned long len = 0, flags = 0;
        struct page *pages[TRAPPED_PAGES_MAX];
        int k, n;
 
+       if (unlikely(trapped_io_disable))
+               return 0;
+
        /* structure must be page aligned */
        if ((unsigned long)tiop & (PAGE_SIZE - 1))
                goto bad;
@@ -86,6 +102,7 @@ int __init register_trapped_io(struct trapped_io *tiop)
        pr_warning("unable to install trapped io filter\n");
        return -1;
 }
+EXPORT_SYMBOL_GPL(register_trapped_io);
 
 void __iomem *match_trapped_io_handler(struct list_head *list,
                                       unsigned long offset,
@@ -113,6 +130,7 @@ void __iomem *match_trapped_io_handler(struct list_head *list,
        spin_unlock_irq(&trapped_lock);
        return NULL;
 }
+EXPORT_SYMBOL_GPL(match_trapped_io_handler);
 
 static struct trapped_io *lookup_tiop(unsigned long address)
 {