This patch removes thread.h, which turns out not to be needed any more.
Signed-off-by: Jeff Dike <[email protected]>
--
arch/um/include/sysdep-i386/kernel-offsets.h | 1 -
arch/um/include/sysdep-i386/sigcontext.h | 3 ++-
arch/um/include/sysdep-i386/thread.h | 8 --------
arch/um/include/sysdep-x86_64/thread.h | 6 ------
arch/um/sys-i386/ptrace_user.c | 1 -
5 files changed, 2 insertions(+), 17 deletions(-)
Index: linux-2.6.22/arch/um/include/sysdep-i386/sigcontext.h
===================================================================
--- linux-2.6.22.orig/arch/um/include/sysdep-i386/sigcontext.h 2007-08-09 13:25:53.000000000 -0400
+++ linux-2.6.22/arch/um/include/sysdep-i386/sigcontext.h 2007-08-09 14:27:51.000000000 -0400
@@ -7,7 +7,8 @@
#define __SYS_SIGCONTEXT_I386_H
#include "uml-config.h"
-#include <sysdep/sc.h>
+#include "skas.h"
+#include "sysdep/sc.h"
#define IP_RESTART_SYSCALL(ip) ((ip) -= 2)
Index: linux-2.6.22/arch/um/include/sysdep-i386/kernel-offsets.h
===================================================================
--- linux-2.6.22.orig/arch/um/include/sysdep-i386/kernel-offsets.h 2007-07-08 19:32:17.000000000 -0400
+++ linux-2.6.22/arch/um/include/sysdep-i386/kernel-offsets.h 2007-08-09 14:43:15.000000000 -0400
@@ -17,6 +17,5 @@
void foo(void)
{
- OFFSET(HOST_TASK_DEBUGREGS, task_struct, thread.arch.debugregs);
#include <common-offsets.h>
}
Index: linux-2.6.22/arch/um/include/sysdep-i386/thread.h
===================================================================
--- linux-2.6.22.orig/arch/um/include/sysdep-i386/thread.h 2007-08-09 13:25:53.000000000 -0400
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-#ifndef __UM_THREAD_H
-#define __UM_THREAD_H
-
-#include <kern_constants.h>
-
-#define TASK_DEBUGREGS(task) ((unsigned long *) &(((char *) (task))[HOST_TASK_DEBUGREGS]))
-
-#endif
Index: linux-2.6.22/arch/um/sys-i386/ptrace_user.c
===================================================================
--- linux-2.6.22.orig/arch/um/sys-i386/ptrace_user.c 2007-08-09 13:25:53.000000000 -0400
+++ linux-2.6.22/arch/um/sys-i386/ptrace_user.c 2007-08-09 14:44:17.000000000 -0400
@@ -11,7 +11,6 @@
/* Grr, asm/user.h includes asm/ptrace.h, so has to follow ptrace_user.h */
#include <asm/user.h>
#include "kern_util.h"
-#include "sysdep/thread.h"
#include "user.h"
#include "os.h"
#include "uml-config.h"
Index: linux-2.6.22/arch/um/include/sysdep-x86_64/thread.h
===================================================================
--- linux-2.6.22.orig/arch/um/include/sysdep-x86_64/thread.h 2007-08-09 13:25:53.000000000 -0400
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-#ifndef __UM_THREAD_H
-#define __UM_THREAD_H
-
-#include <kern_constants.h>
-
-#endif