diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-14 15:37:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-14 15:37:43 -0700 |
| commit | 38400e42713de5f5d0d676eb721bc7f7237f7f18 (patch) | |
| tree | a3231dad3ca043502a4649c4382088b21392178b /include | |
| parent | b75cdf388ecdcd5ab5e66178f19c39a4c94dea26 (diff) | |
| parent | deb75f3c29a13ac37a50d82a256c8dc17de58c3d (diff) | |
| download | kernel_samsung_tuna-38400e42713de5f5d0d676eb721bc7f7237f7f18.zip kernel_samsung_tuna-38400e42713de5f5d0d676eb721bc7f7237f7f18.tar.gz kernel_samsung_tuna-38400e42713de5f5d0d676eb721bc7f7237f7f18.tar.bz2 | |
Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ia64/ptrace.h | 2 | ||||
| -rw-r--r-- | include/asm-ia64/thread_info.h | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/include/asm-ia64/ptrace.h b/include/asm-ia64/ptrace.h index fc54492..a79d1a7 100644 --- a/include/asm-ia64/ptrace.h +++ b/include/asm-ia64/ptrace.h @@ -57,7 +57,9 @@ #include <linux/config.h> #include <asm/fpu.h> +#ifndef ASM_OFFSETS_C #include <asm/asm-offsets.h> +#endif /* * Base-2 logarithm of number of pages to allocate per task structure diff --git a/include/asm-ia64/thread_info.h b/include/asm-ia64/thread_info.h index cf4a950..171b220 100644 --- a/include/asm-ia64/thread_info.h +++ b/include/asm-ia64/thread_info.h @@ -5,7 +5,9 @@ #ifndef _ASM_IA64_THREAD_INFO_H #define _ASM_IA64_THREAD_INFO_H +#ifndef ASM_OFFSETS_C #include <asm/asm-offsets.h> +#endif #include <asm/processor.h> #include <asm/ptrace.h> @@ -51,9 +53,14 @@ struct thread_info { }, \ } +#ifndef ASM_OFFSETS_C /* how to get the thread information struct from C */ #define current_thread_info() ((struct thread_info *) ((char *) current + IA64_TASK_SIZE)) #define alloc_thread_info(tsk) ((struct thread_info *) ((char *) (tsk) + IA64_TASK_SIZE)) +#else +#define current_thread_info() ((struct thread_info *) 0) +#define alloc_thread_info(tsk) ((struct thread_info *) 0) +#endif #define free_thread_info(ti) /* nothing */ #define __HAVE_ARCH_TASK_STRUCT_ALLOCATOR |