rate limit the kmod debug message, update kernel version

8cb0cee4 · Linus Torvalds · c39e9205 · 8cb0cee4 · 8cb0cee4
Commit 8cb0cee4 authored Feb 28, 2002 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 4 deletions

Makefile Makefile +1 -1

kernel/kmod.c kernel/kmod.c +8 -3

No files found.
--- a/Makefile
+++ b/Makefile
 VERSION = 2
 PATCHLEVEL = 5
 SUBLEVEL = 6
-EXTRAVERSION =-pre2
+EXTRAVERSION =-pre3
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)

--- a/kernel/kmod.c
+++ b/kernel/kmod.c
@@ -159,9 +159,14 @@ static int exec_modprobe(void * module_name)
 	ret = exec_usermodehelper(modprobe_path, argv, envp);
 	if (ret) {
-		printk(KERN_DEBUG
+		static unsigned long last;
-		       "kmod: failed to exec %s -s -k %s, errno = %d\n",
+		unsigned long now = jiffies;
-		       modprobe_path, (char*) module_name, errno);
+		if (now - last > HZ) {
+			last = now;
+			printk(KERN_DEBUG
+			       "kmod: failed to exec %s -s -k %s, errno = %d\n",
+			       modprobe_path, (char*) module_name, errno);
+		}
 	}
 	return ret;
 }