aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2009-09-18 23:55:55 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-18 09:48:52 -0700
commit6952b61de9984073289859073e8195ad0bee8fd5 (patch)
treece3336a0650f3be144f1c8ed3ab030a733919a82
parent6423133bdee0e07d1c2f8411cb3fe676c207ba33 (diff)
downloadlinux-2.6.34-ux500-6952b61de9984073289859073e8195ad0bee8fd5.tar.gz
headers: taskstats_kern.h trim
Remove net/genetlink.h inclusion, now sched.c won't be recompiled because of some networking changes. Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--include/linux/delayacct.h1
-rw-r--r--include/linux/taskstats_kern.h1
-rw-r--r--kernel/delayacct.c1
-rw-r--r--mm/memory.c1
4 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/delayacct.h b/include/linux/delayacct.h
index f352f06fa06..5076fe0c8a9 100644
--- a/include/linux/delayacct.h
+++ b/include/linux/delayacct.h
@@ -18,7 +18,6 @@
#define _LINUX_DELAYACCT_H
#include <linux/sched.h>
-#include <linux/taskstats_kern.h>
/*
* Per-task flags relevant to delay accounting
diff --git a/include/linux/taskstats_kern.h b/include/linux/taskstats_kern.h
index 7e9680f4afd..3398f455326 100644
--- a/include/linux/taskstats_kern.h
+++ b/include/linux/taskstats_kern.h
@@ -9,7 +9,6 @@
#include <linux/taskstats.h>
#include <linux/sched.h>
-#include <net/genetlink.h>
#ifdef CONFIG_TASKSTATS
extern struct kmem_cache *taskstats_cache;
diff --git a/kernel/delayacct.c b/kernel/delayacct.c
index abb6e17505e..ead9b610aa7 100644
--- a/kernel/delayacct.c
+++ b/kernel/delayacct.c
@@ -15,6 +15,7 @@
#include <linux/sched.h>
#include <linux/slab.h>
+#include <linux/taskstats.h>
#include <linux/time.h>
#include <linux/sysctl.h>
#include <linux/delayacct.h>
diff --git a/mm/memory.c b/mm/memory.c
index aede2ce3aba..e8f63d9961e 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -56,6 +56,7 @@
#include <linux/swapops.h>
#include <linux/elf.h>
+#include <asm/io.h>
#include <asm/pgalloc.h>
#include <asm/uaccess.h>
#include <asm/tlb.h>