diff --git a/[refs] b/[refs] index 7831e4d54a23..c4e2fcb0b5d3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bd673c7c3b1681dbfabab0062e67398dadf806af +refs/heads/master: 8f3d137e0d6cd470a4e404cbc67480a0febdb0b1 diff --git a/trunk/drivers/char/mxser.c b/trunk/drivers/char/mxser.c index e30575e87648..b638403e8e9c 100644 --- a/trunk/drivers/char/mxser.c +++ b/trunk/drivers/char/mxser.c @@ -1612,8 +1612,10 @@ static int mxser_ioctl_special(unsigned int cmd, void __user *argp) switch (cmd) { case MOXA_GET_MAJOR: - printk(KERN_WARNING "mxser: '%s' uses deprecated ioctl %x, fix " - "your userspace\n", current->comm, cmd); + if (printk_ratelimit()) + printk(KERN_WARNING "mxser: '%s' uses deprecated ioctl " + "%x (GET_MAJOR), fix your userspace\n", + current->comm, cmd); return put_user(ttymajor, (int __user *)argp); case MOXA_CHKPORTENABLE: