diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-22 16:47:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-22 16:47:54 -0700 |
| commit | aca239b793a4006db0d92ad0e43846ab6b54d816 (patch) | |
| tree | 48cc2e4ce1e954b8f3d3ee8fb8a53bb46f5c79aa /include/asm-ia64/mca.h | |
| parent | 16abef0e9e79643827fd5a2a14a07bced851ae72 (diff) | |
| parent | 2c2b94f93f4732c3b9703ce62627e6187e7d6128 (diff) | |
| download | linux-aca239b793a4006db0d92ad0e43846ab6b54d816.tar.bz2 | |
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] run drivers/misc/sgi-xp through scripts/checkpatch.pl
[IA64] run rest drivers/misc/sgi-xp through scripts/Lindent
[IA64] run some drivers/misc/sgi-xp through scripts/Lindent
[IA64] move XP and XPC to drivers/misc/sgi-xp
[IA64] minor irq handler cleanups
[IA64] simplify notify hooks in mca.c
[IA64] do notify DIE_MCA_MONARCH_PROCESS for each monarchs
[IA64] disable interrupts on exit of ia64_trace_syscall
Diffstat (limited to 'include/asm-ia64/mca.h')
| -rw-r--r-- | include/asm-ia64/mca.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-ia64/mca.h b/include/asm-ia64/mca.h index f1663aa94a52..18a4321349a3 100644 --- a/include/asm-ia64/mca.h +++ b/include/asm-ia64/mca.h @@ -157,6 +157,7 @@ extern void ia64_mca_printk(const char * fmt, ...) struct ia64_mca_notify_die { struct ia64_sal_os_state *sos; int *monarch_cpu; + int *data; }; DECLARE_PER_CPU(u64, ia64_mca_pal_base); |