From f303fd0a0e2b6f32033c47a5ac6d7d5bc830edc7 Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@infradead.org>
Date: Tue, 25 Apr 2006 14:54:40 +0100
Subject: [PATCH] --- yaml --- r: 27962 b: refs/heads/master c:
 a3b6714e1744a5e841753d74aca1de5972f24e6d h: refs/heads/master v: v3

---
 [refs]                      |  2 +-
 trunk/include/linux/sched.h | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 4f95a608e12b..dbe4a32f856f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98ca79d52bc34b8dfff729bc8559dbb918c9d02a
+refs/heads/master: a3b6714e1744a5e841753d74aca1de5972f24e6d
diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h
index 29b7d4f87d20..2e05e402df4f 100644
--- a/trunk/include/linux/sched.h
+++ b/trunk/include/linux/sched.h
@@ -1,9 +1,9 @@
 #ifndef _LINUX_SCHED_H
 #define _LINUX_SCHED_H
 
+#ifdef __KERNEL__
 #include <asm/param.h>	/* for HZ */
 
-#include <linux/config.h>
 #include <linux/capability.h>
 #include <linux/threads.h>
 #include <linux/kernel.h>
@@ -37,6 +37,15 @@
 #include <linux/rcupdate.h>
 #include <linux/futex.h>
 
+#include <linux/time.h>
+#include <linux/param.h>
+#include <linux/resource.h>
+#include <linux/timer.h>
+#include <linux/hrtimer.h>
+
+#include <asm/processor.h>
+#endif
+
 #include <linux/auxvec.h>	/* For AT_VECTOR_SIZE */
 
 struct exec_domain;
@@ -103,13 +112,6 @@ extern unsigned long nr_uninterruptible(void);
 extern unsigned long nr_active(void);
 extern unsigned long nr_iowait(void);
 
-#include <linux/time.h>
-#include <linux/param.h>
-#include <linux/resource.h>
-#include <linux/timer.h>
-#include <linux/hrtimer.h>
-
-#include <asm/processor.h>
 
 /*
  * Task state bitmask. NOTE! These bits are also