[PATCH -next 05/11] remove CONFIG_KMOD from sparc64
From: Johannes Berg
Date: Wed Jul 09 2008 - 08:50:38 EST
One place is just a comment, the other a conditional, unused
inclusion of linux/kmod.h.
Signed-off-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Cc: David S. Miller <davem@xxxxxxxxxxxxx>
---
arch/sparc64/kernel/process.c | 6 +++---
arch/sparc64/kernel/traps.c | 3 ---
2 files changed, 3 insertions(+), 6 deletions(-)
--- everything.orig/arch/sparc64/kernel/traps.c 2008-07-08 21:53:12.000000000 +0200
+++ everything/arch/sparc64/kernel/traps.c 2008-07-08 22:00:28.000000000 +0200
@@ -37,9 +37,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"
--- everything.orig/arch/sparc64/kernel/process.c 2008-07-08 21:53:11.000000000 +0200
+++ everything/arch/sparc64/kernel/process.c 2008-07-08 22:00:28.000000000 +0200
@@ -691,9 +691,9 @@ int copy_thread(int nr, unsigned long cl
((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;
--
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/