---

yaml --- r: 36021 b: refs/heads/master c: 8f9a2b3 h: refs/heads/master i: 36019: 82f1b74 v: v3
git-mirror · Sep 27, 2006 · d086bec · d086bec
1 parent 4709875
commit d086bec
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d34555fb20e7abf33f86d7aa3ec0826343f38256
+refs/heads/master: 8f9a2b324644d3f8c233287f0a7764d61655cda4
diff --git a/trunk/include/asm-mips/Kbuild b/trunk/include/asm-mips/Kbuild
@@ -1 +1,3 @@
 include include/asm-generic/Kbuild.asm
+
+header-y += sgidefs.h
diff --git a/trunk/include/asm-mips/ptrace.h b/trunk/include/asm-mips/ptrace.h
@@ -10,8 +10,6 @@
 #define _ASM_PTRACE_H
 
 
-#include <asm/isadep.h>
-
 /* 0 - 31 are integer registers, 32 - 63 are fp registers.  */
 #define FPR_BASE	32
 #define PC		64
@@ -73,6 +71,7 @@ struct pt_regs {
 #ifdef __KERNEL__
 
 #include <linux/linkage.h>
+#include <asm/isadep.h>
 
 /*
  * Does the process account for user or for system time?

diff --git a/trunk/include/asm-mips/timex.h b/trunk/include/asm-mips/timex.h
@@ -8,6 +8,8 @@
 #ifndef _ASM_TIMEX_H
 #define _ASM_TIMEX_H
 
+#ifdef __KERNEL__
+
 #include <asm/mipsregs.h>
 
 /*
@@ -51,4 +53,6 @@ static inline cycles_t get_cycles (void)
 	return read_c0_count();
 }
 
+#endif /* __KERNEL__ */
+
 #endif /*  _ASM_TIMEX_H */
diff --git a/trunk/include/asm-mips/user.h b/trunk/include/asm-mips/user.h
@@ -8,6 +8,8 @@
 #ifndef _ASM_USER_H
 #define _ASM_USER_H
 
+#ifdef __KERNEL__
+
 #include <asm/page.h>
 #include <asm/reg.h>
 
@@ -55,4 +57,6 @@ struct user {
 #define HOST_DATA_START_ADDR	(u.start_data)
 #define HOST_STACK_END_ADDR	(u.start_stack + u.u_ssize * NBPG)
 
+#endif /* __KERNEL__ */
+
 #endif /* _ASM_USER_H */
Original file line number	Diff line number	Diff line change
		@@ -1 +1,3 @@
		include include/asm-generic/Kbuild.asm

		header-y += sgidefs.h