diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 16:12:20 +0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 16:12:20 +0400 |
| commit | 165415f700b0c77fa1f8db6198f48582639adf78 (patch) | |
| tree | 088e305b0b5b0c6753072e13be1177824c3ed59d /include/asm-ia64/ptrace.h | |
| parent | c324b44c34050cf2a9b58830e11c974806bd85d8 (diff) | |
| parent | 2f4ba45a75d6383b4a1201169a808ffea416ffa0 (diff) | |
| download | linux-165415f700b0c77fa1f8db6198f48582639adf78.tar.xz | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'include/asm-ia64/ptrace.h')
| -rw-r--r-- | include/asm-ia64/ptrace.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-ia64/ptrace.h b/include/asm-ia64/ptrace.h index 0bef19538406..fc544929ac34 100644 --- a/include/asm-ia64/ptrace.h +++ b/include/asm-ia64/ptrace.h @@ -57,7 +57,7 @@ #include <linux/config.h> #include <asm/fpu.h> -#include <asm/offsets.h> +#include <asm/asm-offsets.h> /* * Base-2 logarithm of number of pages to allocate per task structure @@ -119,7 +119,7 @@ struct pt_regs { unsigned long ar_unat; /* interrupted task's NaT register (preserved) */ unsigned long ar_pfs; /* prev function state */ unsigned long ar_rsc; /* RSE configuration */ - /* The following two are valid only if cr_ipsr.cpl > 0: */ + /* The following two are valid only if cr_ipsr.cpl > 0 || ti->flags & _TIF_MCA_INIT */ unsigned long ar_rnat; /* RSE NaT */ unsigned long ar_bspstore; /* RSE bspstore */ |