2005-10-24 15:50:16

by Miklos Szeredi

Subject: [PATCH resend] uml: fix compile failure for TT mode

Linus,

I think you should apply this before 2.6.14, to fix UML compile:

Without this patch, uml compile fails with:

LD .tmp_vmlinux1
arch/um/kernel/built-in.o: In function `config_gdb_cb':
arch/um/kernel/tt/gdb.c:129: undefined reference to `TASK_EXTERN_PID'

Tested on i386, but fix needed on x86_64 too AFAICS.

Signed-off-by: Miklos Szeredi <[email protected]>

---
Index: linux/arch/um/include/sysdep-i386/thread.h
===================================================================
--- linux.orig/arch/um/include/sysdep-i386/thread.h 2005-10-22 17:45:55.000000000 +0200
+++ linux/arch/um/include/sysdep-i386/thread.h 2005-10-22 17:55:44.000000000 +0200
@@ -4,7 +4,7 @@
#include <kern_constants.h>

#define TASK_DEBUGREGS(task) ((unsigned long *) &(((char *) (task))[HOST_TASK_DEBUGREGS]))
-#ifdef CONFIG_MODE_TT
+#ifdef UML_CONFIG_MODE_TT
#define TASK_EXTERN_PID(task) *((int *) &(((char *) (task))[HOST_TASK_EXTERN_PID]))
#endif

Index: linux/arch/um/include/sysdep-x86_64/thread.h
===================================================================
--- linux.orig/arch/um/include/sysdep-x86_64/thread.h 2005-10-22 17:09:00.000000000 +0200
+++ linux/arch/um/include/sysdep-x86_64/thread.h 2005-10-22 17:55:58.000000000 +0200
@@ -3,7 +3,7 @@

#include <kern_constants.h>

-#ifdef CONFIG_MODE_TT
+#ifdef UML_CONFIG_MODE_TT
#define TASK_EXTERN_PID(task) *((int *) &(((char *) (task))[HOST_TASK_EXTERN_PID]))
#endif

2005-10-24 19:35:56

by Jeff Dike

Subject: Re: [PATCH resend] uml: fix compile failure for TT mode

On Mon, Oct 24, 2005 at 05:49:34PM +0200, Miklos Szeredi wrote:
> Without this patch, uml compile fails with:
>
> LD .tmp_vmlinux1
> arch/um/kernel/built-in.o: In function `config_gdb_cb':
> arch/um/kernel/tt/gdb.c:129: undefined reference to `TASK_EXTERN_PID'
>
> Tested on i386, but fix needed on x86_64 too AFAICS.
>
> Signed-off-by: Miklos Szeredi <[email protected]>

Acked-by: Jeff Dike <[email protected]>

Jeff