Commit 5b5f13cd authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://kernel.bkbits.net/davem/bt-2.6

into home.osdl.org:/home/torvalds/v2.5/linux
parents 4a1d861e 11b26af7
...@@ -105,16 +105,6 @@ int request_module(const char *fmt, ...) ...@@ -105,16 +105,6 @@ int request_module(const char *fmt, ...)
} }
ret = call_usermodehelper(modprobe_path, argv, envp, 1); ret = call_usermodehelper(modprobe_path, argv, envp, 1);
if (ret != 0) {
static unsigned long last;
unsigned long now = jiffies;
if (now - last > HZ) {
last = now;
printk(KERN_DEBUG
"request_module: failed %s -- %s. error = %d\n",
modprobe_path, module_name, ret);
}
}
atomic_dec(&kmod_concurrent); atomic_dec(&kmod_concurrent);
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