diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-16 10:44:43 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-16 10:44:43 -0800 |
| commit | d8bef0bb219154e655fa139e28400d6ae9aa3727 (patch) | |
| tree | 44ec9d752831c5fe6bc7ad1208febe0bf19b8996 /arch/ia64/include/asm/mca.h | |
| parent | 37c24b37fb2454e95136139d10bb6828967105bf (diff) | |
| parent | 430677133fd5a2033222b3b5016bb461fe8fabf2 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] implement early_io{re,un}map for ia64
[IA64] Replace old style lock initializer
[IA64] fix SBA IOMMU to handle allocation failure properly
[IA64] Save I-resources to ia64_sal_os_state
[IA64] preallocate IA64_IRQ_MOVE_VECTOR
Diffstat (limited to 'arch/ia64/include/asm/mca.h')
| -rw-r--r-- | arch/ia64/include/asm/mca.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/ia64/include/asm/mca.h b/arch/ia64/include/asm/mca.h index c171cdf0a78..43f96ab18fa 100644 --- a/arch/ia64/include/asm/mca.h +++ b/arch/ia64/include/asm/mca.h @@ -106,6 +106,11 @@ struct ia64_sal_os_state { unsigned long os_status; /* OS status to SAL, enum below */ unsigned long context; /* 0 if return to same context 1 if return to new context */ + + /* I-resources */ + unsigned long iip; + unsigned long ipsr; + unsigned long ifs; }; enum { |