diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-12 02:51:40 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-12 02:51:40 +0400 |
| commit | 357d596bd552ad157a906289ab13ea6ba7e66e3d (patch) | |
| tree | 78b8f6bc2781af2e95a6cf2b20a06dfe8bb04e5c /include/asm-ia64/ptrace.h | |
| parent | e6c69bd39199656a8bbd0569edaff60574ff9cac (diff) | |
| parent | d67eb16f5d444fb6d173bcec889ddb2066c0fa0c (diff) | |
| download | linux-357d596bd552ad157a906289ab13ea6ba7e66e3d.tar.xz | |
Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'include/asm-ia64/ptrace.h')
| -rw-r--r-- | include/asm-ia64/ptrace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-ia64/ptrace.h b/include/asm-ia64/ptrace.h index c8766def9ee6..fc544929ac34 100644 --- a/include/asm-ia64/ptrace.h +++ b/include/asm-ia64/ptrace.h @@ -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 */ |