]> err.no Git - linux-2.6/commitdiff
remove CONFIG_KMOD from sparc64
authorJohannes Berg <johannes@sipsolutions.net>
Tue, 8 Jul 2008 17:00:20 +0000 (19:00 +0200)
committerRusty Russell <rusty@rustcorp.com.au>
Tue, 22 Jul 2008 09:24:30 +0000 (19:24 +1000)
One place is just a comment, the other a conditional, unused
inclusion of linux/kmod.h.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
arch/sparc64/kernel/process.c
arch/sparc64/kernel/traps.c

index c1f1ff29e9799a22d97100635477d864dece5a09..31ea752d307be15132530cbc1f7aa9ad1b97c630 100644 (file)
@@ -683,9 +683,9 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long sp,
                  ((unsigned long) child_sf) - STACK_BIAS;
 
                /* Special case, if we are spawning a kernel thread from
-                * a userspace task (via KMOD, NFS, or similar) we must
-                * disable performance counters in the child because the
-                * address space and protection realm are changing.
+                * a userspace task (usermode helper, NFS or similar), we
+                * must disable performance counters in the child because
+                * the address space and protection realm are changing.
                 */
                if (t->flags & _TIF_PERFCTR) {
                        t->user_cntd0 = t->user_cntd1 = NULL;
index 0aa819c29dbc795b0c078a27a04dc6b25b59960e..bd30ecba563010bfced1ad54950875e59f160418 100644 (file)
@@ -36,9 +36,6 @@
 #include <asm/processor.h>
 #include <asm/timer.h>
 #include <asm/head.h>
-#ifdef CONFIG_KMOD
-#include <linux/kmod.h>
-#endif
 #include <asm/prom.h>
 
 #include "entry.h"