diff --git a/[refs] b/[refs]
index 78f2db8f46fe..a1d0cb9768e7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17740d89785aeb4143770923d67c293849414710
+refs/heads/master: 96d07d211739fd2450ac54e81d00fa40fcd4b1bd
diff --git a/trunk/include/linux/resource.h b/trunk/include/linux/resource.h
index 40fc7e626082..f1e914eefeab 100644
--- a/trunk/include/linux/resource.h
+++ b/trunk/include/linux/resource.h
@@ -3,8 +3,6 @@
 
 #include <linux/time.h>
 
-struct task_struct;
-
 /*
  * Resource control/accounting header file for linux
  */
@@ -70,6 +68,12 @@ struct rlimit {
  */
 #include <asm/resource.h>
 
+#ifdef __KERNEL__
+
+struct task_struct;
+
 int getrusage(struct task_struct *p, int who, struct rusage __user *ru);
 
+#endif /* __KERNEL__ */
+
 #endif