diff options
author | Steve French | 2005-10-27 21:53:03 +0200 |
---|---|---|
committer | Steve French | 2005-10-27 21:53:03 +0200 |
commit | 04290949b3daef35d6279dcc05f01b549ac1772b (patch) | |
tree | d34203b71660b9b4f7676f5bae7e0b9838ff161f /arch/um/include | |
parent | Merge with /pub/scm/linux/kernel/git/sfrench/cifs-2.6.git/ (diff) | |
parent | [PATCH] Yet more posix-cpu-timer fixes (diff) | |
download | kernel-qcow2-linux-04290949b3daef35d6279dcc05f01b549ac1772b.tar.gz kernel-qcow2-linux-04290949b3daef35d6279dcc05f01b549ac1772b.tar.xz kernel-qcow2-linux-04290949b3daef35d6279dcc05f01b549ac1772b.zip |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/um/include')
-rw-r--r-- | arch/um/include/sysdep-i386/thread.h | 2 | ||||
-rw-r--r-- | arch/um/include/sysdep-x86_64/thread.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/include/sysdep-i386/thread.h b/arch/um/include/sysdep-i386/thread.h index e2bd6bae8b8a..243fed44d780 100644 --- a/arch/um/include/sysdep-i386/thread.h +++ b/arch/um/include/sysdep-i386/thread.h @@ -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 diff --git a/arch/um/include/sysdep-x86_64/thread.h b/arch/um/include/sysdep-x86_64/thread.h index 6a76a7f3683f..cbef3e1697f4 100644 --- a/arch/um/include/sysdep-x86_64/thread.h +++ b/arch/um/include/sysdep-x86_64/thread.h @@ -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 |