diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-07-08 13:00:20 -0400 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-07-22 05:24:30 -0400 |
commit | 184b6c7682e484032e3f845eef5db26e72681d6f (patch) | |
tree | a2f212222ce87507615d0dbad35b9a2203bbb756 /arch/sparc64 | |
parent | df648c9fbebb4de50e7a6e76cc253c7cb0421f9b (diff) |
remove CONFIG_KMOD from sparc64
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>
Diffstat (limited to 'arch/sparc64')
-rw-r--r-- | arch/sparc64/kernel/process.c | 6 | ||||
-rw-r--r-- | arch/sparc64/kernel/traps.c | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/arch/sparc64/kernel/process.c b/arch/sparc64/kernel/process.c index c1f1ff29e979..31ea752d307b 100644 --- a/arch/sparc64/kernel/process.c +++ b/arch/sparc64/kernel/process.c | |||
@@ -683,9 +683,9 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long sp, | |||
683 | ((unsigned long) child_sf) - STACK_BIAS; | 683 | ((unsigned long) child_sf) - STACK_BIAS; |
684 | 684 | ||
685 | /* Special case, if we are spawning a kernel thread from | 685 | /* Special case, if we are spawning a kernel thread from |
686 | * a userspace task (via KMOD, NFS, or similar) we must | 686 | * a userspace task (usermode helper, NFS or similar), we |
687 | * disable performance counters in the child because the | 687 | * must disable performance counters in the child because |
688 | * address space and protection realm are changing. | 688 | * the address space and protection realm are changing. |
689 | */ | 689 | */ |
690 | if (t->flags & _TIF_PERFCTR) { | 690 | if (t->flags & _TIF_PERFCTR) { |
691 | t->user_cntd0 = t->user_cntd1 = NULL; | 691 | t->user_cntd0 = t->user_cntd1 = NULL; |
diff --git a/arch/sparc64/kernel/traps.c b/arch/sparc64/kernel/traps.c index 0aa819c29dbc..bd30ecba5630 100644 --- a/arch/sparc64/kernel/traps.c +++ b/arch/sparc64/kernel/traps.c | |||
@@ -36,9 +36,6 @@ | |||
36 | #include <asm/processor.h> | 36 | #include <asm/processor.h> |
37 | #include <asm/timer.h> | 37 | #include <asm/timer.h> |
38 | #include <asm/head.h> | 38 | #include <asm/head.h> |
39 | #ifdef CONFIG_KMOD | ||
40 | #include <linux/kmod.h> | ||
41 | #endif | ||
42 | #include <asm/prom.h> | 39 | #include <asm/prom.h> |
43 | 40 | ||
44 | #include "entry.h" | 41 | #include "entry.h" |