diff options
| author |   Tony Luck <tony.luck@intel.com> | 2005-09-14 14:14:45 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-09-14 14:14:45 -0700 |
| commit | deb75f3c29a13ac37a50d82a256c8dc17de58c3d (patch) | |
| tree | 23282559a1d2d40464efaed0d98a96e269316d32 /include | |
| parent | Fix yenta error message when unable to find a bus assignment (diff) | |
| parent | [IA64] fix circular dependency on generation of asm-offsets.h (diff) | |
| download | linux-dev-deb75f3c29a13ac37a50d82a256c8dc17de58c3d.tar.xz linux-dev-deb75f3c29a13ac37a50d82a256c8dc17de58c3d.zip | |
Pull fix-offsets-h into release branch
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 fc544929ac34..a79d1a7ecc77 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 cf4a950a0f4f..171b2207bde4 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 |