Commit 8cb0cee4 authored by Linus Torvalds's avatar Linus Torvalds

rate limit the kmod debug message, update kernel version

parent c39e9205
VERSION = 2 VERSION = 2
PATCHLEVEL = 5 PATCHLEVEL = 5
SUBLEVEL = 6 SUBLEVEL = 6
EXTRAVERSION =-pre2 EXTRAVERSION =-pre3
KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
......
...@@ -159,10 +159,15 @@ static int exec_modprobe(void * module_name) ...@@ -159,10 +159,15 @@ static int exec_modprobe(void * module_name)
ret = exec_usermodehelper(modprobe_path, argv, envp); ret = exec_usermodehelper(modprobe_path, argv, envp);
if (ret) { if (ret) {
static unsigned long last;
unsigned long now = jiffies;
if (now - last > HZ) {
last = now;
printk(KERN_DEBUG printk(KERN_DEBUG
"kmod: failed to exec %s -s -k %s, errno = %d\n", "kmod: failed to exec %s -s -k %s, errno = %d\n",
modprobe_path, (char*) module_name, errno); modprobe_path, (char*) module_name, errno);
} }
}
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment