74 lines
1.8 KiB
Diff
74 lines
1.8 KiB
Diff
# Cleanups for kernel header exports, from linux-mips.org 2.6.18-stable,
|
|
# scheduled for mainline.
|
|
|
|
|
|
diff --git a/include/asm-mips/Kbuild b/include/asm-mips/Kbuild
|
|
index c68e168..7897f05 100644
|
|
--- a/include/asm-mips/Kbuild
|
|
+++ b/include/asm-mips/Kbuild
|
|
@@ -1 +1,3 @@
|
|
include include/asm-generic/Kbuild.asm
|
|
+
|
|
+header-y += cachectl.h sgidefs.h sysmips.h
|
|
diff --git a/include/asm-mips/ptrace.h b/include/asm-mips/ptrace.h
|
|
index 4113316..4fb0fc4 100644
|
|
--- a/include/asm-mips/ptrace.h
|
|
+++ b/include/asm-mips/ptrace.h
|
|
@@ -10,8 +10,6 @@ #ifndef _ASM_PTRACE_H
|
|
#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 @@ #define PTRACE_GET_THREAD_AREA_3264 0xc4
|
|
#ifdef __KERNEL__
|
|
|
|
#include <linux/linkage.h>
|
|
+#include <asm/isadep.h>
|
|
|
|
/*
|
|
* Does the process account for user or for system time?
|
|
diff --git a/include/asm-mips/timex.h b/include/asm-mips/timex.h
|
|
index 98aa737..b80de8e 100644
|
|
--- a/include/asm-mips/timex.h
|
|
+++ b/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/include/asm-mips/user.h b/include/asm-mips/user.h
|
|
index 89bf8b4..61f2a09 100644
|
|
--- a/include/asm-mips/user.h
|
|
+++ b/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 @@ #define HOST_TEXT_START_ADDR (u.start_co
|
|
#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 */
|