diff --git a/[refs] b/[refs] index f62a23b95d01..4bb1e649fc96 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b899c5ed2ef3af3429abd8046197255f179ea496 +refs/heads/master: 9e094c17ee2b85130ab7b2ea37456f6867eb687a diff --git a/trunk/kernel/irq/spurious.c b/trunk/kernel/irq/spurious.c index 32b161972fad..a6b2bc831dd0 100644 --- a/trunk/kernel/irq/spurious.c +++ b/trunk/kernel/irq/spurious.c @@ -10,6 +10,7 @@ #include #include #include +#include static int irqfixup __read_mostly; @@ -225,6 +226,8 @@ int noirqdebug_setup(char *str) } __setup("noirqdebug", noirqdebug_setup); +module_param(noirqdebug, bool, 0644); +MODULE_PARM_DESC(noirqdebug, "Disable irq lockup detection when true"); static int __init irqfixup_setup(char *str) { @@ -236,6 +239,8 @@ static int __init irqfixup_setup(char *str) } __setup("irqfixup", irqfixup_setup); +module_param(irqfixup, int, 0644); +MODULE_PARM_DESC("irqfixup", "0: No fixup, 1: irqfixup mode 2: irqpoll mode"); static int __init irqpoll_setup(char *str) {