---

yaml --- r: 163629 b: refs/heads/master c: 6952b61 h: refs/heads/master i: 163627: 521fb27 v: v3
git-mirror · Sep 18, 2009 · 54de9fe · 54de9fe
1 parent 64611d9
commit 54de9fe
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6423133bdee0e07d1c2f8411cb3fe676c207ba33
+refs/heads/master: 6952b61de9984073289859073e8195ad0bee8fd5
diff --git a/trunk/include/linux/delayacct.h b/trunk/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/trunk/include/linux/taskstats_kern.h b/trunk/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/trunk/kernel/delayacct.c b/trunk/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/trunk/mm/memory.c b/trunk/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>